Merge from open-source master
tree: c8ffa08f80bee9197067581b35a049d4164225f6
  1. src/
  2. Android.mk
  3. AndroidManifest.xml
  4. MODULE_LICENSE_APACHE2
  5. NOTICE