Merge "Fix license and license text."
tree: df634909f12926560cd3ec44e69d7dbabfbf886a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml