DO NOT MERGE

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

Bug: 120502534
Change-Id: I3c70aecb44ccb1a760ebe602a7c2afceee32459e
tree: 7361bbb0f418c5425a8c9f0690d9a4c90e7b59b6
  1. assets/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml