Merge 92718c82043f61d061ced1430634ad3d1ba54530 on remote branch

Change-Id: I885a76f4a5f9d62f22f0eab60000539f66cb88e5
tree: 8dc469e64364fb85fbfbfebe72e96676963beb43
  1. api/
  2. java/
  3. Android.bp
  4. OWNERS