DO NOT MERGE

Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: I8d47f1591ee94c083c87de8979c62a435949811c
tree: 9dd6204ca41a9a19cc481c9fbfd6f5c4b2d3435f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg