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

Change-Id: I41829b5b9ed7e18d8c248d9bb0081047ef081203
tree: 1741c8470ed8485b412ec70737b25be6dcdbd2ba
  1. codec2/
  2. hooks/
  3. media/
  4. Android.bp
  5. OWNERS