[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 8cefb8fff4  -s ours am: b319e7d706  -s ours
am: 9115ac7236  -s ours

Change-Id: I7faf24c9c41df3d540b4fd77be5a30116cc88f18
tree: 6e91ebdd95e6e70f5d8672ea1b0a53ddcad1f2b6
  1. codec2/
  2. hooks/
  3. media/
  4. Android.bp
  5. OWNERS