Merge 68fad68a002dd0ca7a1d36e7c8e565bdc1982da1 on remote branch

Change-Id: I8b984632c2b9aac9e50867ccf347c18dc350d0d7
tree: 886f761919f0e077eefd25bd01ba79da6ab38372
  1. hooks/
  2. media/
  3. Android.bp
  4. METADATA
  5. OWNERS