Merge changes from topic "android-internal-srcs"

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