Merge 8239fcefb1a9c22885b58daaf483c917019a48b7 on remote branch

Change-Id: I5decf681a17a6b1929b23e1b3d571ea718750dae
tree: 6032c5e1ad7dd0775ec4c87cfbbc83150edc90b2
  1. apex/
  2. Android.bp
  3. OWNERS