Merge "Fix build break." into klp-dev
tree: 32f3e2b8a8985b62b4953d19dadde49db3b43c9e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags