This reverts commit dc2df9c8. Reason for revert: Breaking aosp-master builds. Change-Id: Ib13b5d512f58ce6b2166523776bd87f2851bc353