Merge cherrypicks of [5193933] into pi-qpr1-release

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