This reverts commit 7e0a2cb5. Reason for revert: broke TARGET_BUILD_APPS builds Change-Id: I5316a62f77bb38f6195e3df5e31b073dbd1eb682