This reverts commit 7c8010211d.
Reason for revert: Original change broke the build. This is a clean
revert. The next change in the relation chain here fixes the error.
Bug: 177500482
Bug: 182896753
Test: mmma frameworks/base/ RUN_ERROR_PRONE=true
CTS-Coverage-Bug: 182853869
Change-Id: I0a0ce22feb2e54769103f8f4eecbffe425099412