This reverts commit 487b2e64. Reason for revert: failing build target configuration is fixed Change-Id: I7c69b7244b4262336e427e4c671aaebb70ddc6ed