merge in klp-release history after reset to klp-dev
tree: 538cf87eb7b9e7dceafcc07a0b9e1e3cc94bd662
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags