Merge changes If11b88a0,I34444857,Ie64f7daa am: 252fed4f12
am: 0a7e44ef1f

Change-Id: I3a656bd80ea0178f29c3209b232c58ab4a66b7fb
tree: a943bc9d1016bd608f84d9832bfcaad34c56cea0
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE