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

Change-Id: Ib6157ce6e2329add7875a9a40f94e3825fdab6ce