This reverts commit f336d1e9cf8b48fe73ad8527365d5286d673ffba. Reason for revert: Reverting this CL as it causes several build breakages in git_stage-aosp-master Change-Id: I4a29f7313857a561452c01fb331accbf59c64a72