[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 359d972523  -s ours
am: 08bd3b50af  -s ours

Change-Id: I0909ff045feca383bbc8bc5566fe8f15f33beb51
tree: 79813b6a37595debeeb0ab3110fdf93cb9c5cdde
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml