This reverts commit 007bc12c. Reason for revert: Breaks multiple targets on git_pi-dev-plus-aosp. Change-Id: Id101d66826954d2a95b1156e476a21f740bc5797