Merge "Fix 674-hiddenapi run-test on AOSP host"
am: 548da10bd8

Change-Id: I38b095c52d5d7cb5a5daa03b380b74034209d338