DO NOT MERGE

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

Bug: 118454372
Change-Id: I67f43c132386807bcc0cc8fe6dbc07a1800b9917
tree: ee9e11b23ccc14799bb69ee46edf58c994598cab
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/