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

Change-Id: I6f97dbe7ef2d52a52b44154a5d8a7a129eda8f87
tree: 1a25cf089dcfb64a65eecf5c1036361a4dd40878
  1. codec2/
  2. hooks/
  3. media/
  4. Android.bp
  5. OWNERS