This reverts commit 8bf10c74. Reason for revert: Breaks run-test 674-hiddenapi Change-Id: I014b29bf502d98d3e4134c16302008de085f64e2