am 001eb417: Merge from open-source master

Merge commit '001eb417d9cc6abc7478fc3e0528b74f8289a758'

* commit '001eb417d9cc6abc7478fc3e0528b74f8289a758':
tree: b9128f38242b2d7b1b7f665b8aafd458bb5c7f6a
  1. src/
  2. Android.mk
  3. AndroidManifest.xml
  4. MODULE_LICENSE_APACHE2
  5. NOTICE