Merge changes I6af1fc7d,I0627d54a

* changes:
  Automated g4 rollback of changelist 167310802.
  Automated g4 rollback of changelist 167332236.
tree: f0b6004c5f2d035f0f4c177455bea79c5047d1a4
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE