Merge cherrypicks of [7839124, 7838123] into pi-qpr3-b-release

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