Merge cherrypicks of [6974088, 6974089, 6974090, 6974091] into pi-qpr3-b-release

Change-Id: I19a3190e95b2e17db6e1fc046f11e1a5b8d42715
tree: 22a935070a656d30680e6fe8f660359a0c823a7c
  1. codec2/
  2. hooks/
  3. media/
  4. Android.bp
  5. OWNERS