Merge "Add explicit dependency from core-oj to hiddenapi annotations"