Merge 78f0240e4fa3c915ecd5ac315172ad5bfe1fcc77 on remote branch

Change-Id: I561e5dd37ddd1d986c168ef60ac0a8387f9cadae
tree: 1de9b7b71ee4add95776b718044acced8f100bc7
  1. apex/
  2. Android.bp
  3. OWNERS