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

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