Merge "Change path to hiddenapi for run-tests"