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

Change-Id: I8f540b0896c8c79c923060a3e0d8499137561979