Merge klp-dev-plus-aosp into stage-aosp-master

Change-Id: I9f294587991055d15c369b3c1c4e23663ce35b9a
tree: 1b0f6d88447cdf857c0577cc2590c1c066e5b2de
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags