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

Change-Id: I9455ccf59e1f173ae7b5a66e594b53dc1999c807