Merge commit '9b9e7485747fe60b315aacb05c0c61b802cbc7c6' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I2a84192e94ca0eb7ec2e54d059581cac4c103a25
Merged-In: Ia8e8194028825190addbe3b2c33da2a54d83d6fc
tree: c687be5642e280cefa6f358680b4ce5d965a144a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags