Merge 01ad674a390969b378286cafe7cffeee7eaf9902 on remote branch

Change-Id: Id221f06408af641dbf5008292b9bd78eedae7dff
tree: c45e98e7f8b8888658a589b1ac4e808862e2cf8a
  1. api/
  2. java/
  3. Android.bp