This reverts commit 7d1213dd5d. Reason for revert: multiple build breakages b/137069068 Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff
7d1213dd5d