Revert "Fix full-eng build breakage due to dbacd826a100f2c." am: d5715c5d2d am: c6b5b67139 am: f9b3f6b9e6 am: 1833088893
am: 6a7e3ac83b

Change-Id: I31611cc17627579b99f301fd10d6ff680bfeef4b