Merge 54230d04878d1af85b9f8f547832eac06322693a on remote branch

Change-Id: I95caa408a391449fdeb5e04fd146ff2c9d1efbd6
tree: 40e54e551a2cd8d9c799b17e37988fe043cef85e
  1. api/
  2. java/
  3. Android.bp
  4. OWNERS