merge in klp-release (no-op)
tree: 38432fd63fd4be0ac02d0b3c1c166f5e69a0a901
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags