Merge "Address further API council comments." into rvc-dev am: 0474fd6615 am: 92cadfc4c2

Change-Id: Ia564f3ff70468be198c23b47669c274cd144aaae
tree: a89c2eca647e82bc51d6555cc99e1dd4e51ae320
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp