Updates based on API council guidance.
am: 1558e380e4

Change-Id: I64dde548c55333d1181d94cf7c2a160a8334004c
tree: f9b6faa70e291cd45c063683964403a2fd8513b4
  1. apache/
  2. assets/
  3. java/
  4. Android.mk
  5. AndroidManifest.xml
  6. CONTRIBUTING
  7. LICENSE