DO NOT MERGE

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

Bug: 120502534
Change-Id: I4370bec1153764a96378fc7d069d4384edcaa163
tree: 72b5e02633c3fc4f70c4c682dc85a033fbf4a571
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags