[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: e57aef115c  -s ours
am: ab911b6ece  -s ours

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