Merge changes Ida554313,Ie7187b02,I7a7c23b4 am: ef7a7eb0f1 am: 67bbb72fa5 am: 6fad8102be
am: 0c1bbbee96

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