merge from open-source master
tree: a724a2280d50653128b0284f9cef212906062fb0
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml