DO NOT MERGE

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

Bug: 120502534
Change-Id: I9062eecd2fedfe049f40cafefc4ae927c24d6b3c
tree: 4624ea73151b8edae258f82fc4f9790bfd0c2f70
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/