Merge e76b022df7a65050206569e2bde91e9ab8b54964 on remote branch

Change-Id: I4c9f106e8306b56705fe5df1c7790dc6bafac52e
tree: 8f2b54283f43289bbe48f008ff179686ddc9b2ed
  1. apex/
  2. Android.bp
  3. OWNERS