This reverts commit ad50aca6. Reason for revert: Broke builds when combined with aosp/2876755 Change-Id: I3bfbcb05d8c695b9315b7e8e3f63c6bd5c9dbe36