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

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