Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: I286858c029db1a99e4a220a1033fd773a5326439
BUG: 129345239
tree: 37155cdd5523cbcf62726ade850b3eb80913ecb1
  1. codec2/
  2. hooks/
  3. media/
  4. Android.bp
  5. OWNERS