am e183a9ee: Merge "Fix build break." into klp-dev

* commit 'e183a9ee2231adcaf288a47c770c4b4ec289f5e8':
  Fix build break.
tree: dadb68d52004723e824e5befec59bd4bf8537abf
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags