This reverts commit 394951da. Reason for revert: some targets are broken Bug: 142773030 Change-Id: I4ce2e4a4c683c71958bc4f73e45a5ddd4a4ae32a