Merge cherrypicks of [5098694, 5098695] into pi-qpr1-release

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