Reconcile with klp-release - do not merge

Change-Id: Ib56d73d34accd8959f64da57972c6c3066dd9635
tree: aae02d02bd5f0793315bec5a29501dceccf1b788
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags