Merge "Add explicit dependency from android.test.base to hiddenapi annotations"