Merge "Change path to hiddenapi for run-tests"
am: e65febd52f

Change-Id: Ia54f605d0a255b619c1ebb0df6c60e13a7fd83b8