Merge "Fix build." into master-nova
tree: f19c230c3e3bfeb6c1c035fe7addb08bcd5c9b3d
  1. libs/
  2. res/
  3. src/
  4. tests/
  5. .classpath
  6. .project
  7. Android.mk
  8. AndroidManifest.xml