Snap for 6496753 from 6d77d222fc654fd5c51ba5268b64b4fc743f4bdf to rvc-d1-release

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