Merge 19bcf1d9824d0660b60932cb79deadb218f1b092 on remote branch

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