This reverts commit 23a4120c. Reason for revert: broke soong_integration Change-Id: I4d51841756675b3745244d23e13aefda0916614b