Merge changes from topic "unsupported-internal"

* changes:
  Add @UnsupportedAppUsage annotations
  Add android internal dirs to hiddenapi-mappings