Merge cee4e66d9f2a377025d70ecb91ab9c5a2688ad84 on remote branch

Change-Id: I98f7ef08a9eae585b86e6f0718cc64e78a987757
tree: 53b642e1cdadc3cc6d74d9b51b08d8c4719420a8
  1. assets/
  2. Android.bp
  3. AndroidManifest.xml
  4. LICENSE
  5. OWNERS
  6. README.txt