Merge "Fix 674-hiddenapi run-test on AOSP host"