Merge "Roll forward 161418474."
tree: d859db4208aa031cb9b1b8103cc0e1efc4538d6c
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE