Merge cherrypicks of [5043421, 5044256] into pi-qpr1-release

Change-Id: Ia5fbbf02f0759decad2a032366472968b36b98ed
tree: 8acfa58bf7d150229abc6f0d5b47aa3a925ac63b
  1. codec2/
  2. hooks/
  3. media/
  4. Android.bp
  5. OWNERS