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

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