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