This reverts commit 3d9bfc18. Reason for revert: Breaks run-test 674-hiddenapi Change-Id: Ie28adc7acc38dfe1d760c799cc7ec1fc90904205