This reverts commit 6a350878. Reason for revert: Breakage of many AOSP targets Change-Id: I917e6daa04ac02ecb98c7bb1816f9bdaf46429f5