Merge changes If86250b1,Ib2a01013 am: 4114f539e7 am: c65e72a520 am: 819575fb35
am: 83afa58db6

Change-Id: I3cae2c8d01748ebba5307cca2c621943b6f8a31a
tree: 693a84e47767545c76d7a474265eca5ff87d8d17
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. LICENSE