This reverts commit dada4c60. Reason for revert: Breaking aosp-master builds. Change-Id: Ie48b2125025878ce13953706a7eec24bce38594b