merge from open-source master
tree: 0a361be52adf2fe34f0a9eddc5f07a09b66cc13a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE