DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: feea31acc7

Change-Id: Icffece429ddcca704b7d2e5f62d3a3296b09954c
tree: d9a88ad091c92477b5f002f56309cb74d8b09f0e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml