Merge a1c871675dfd1669f126c9d6a7e9331df14b69df on remote branch

Change-Id: I2787005fc9afd1e88596c440392cedb731683d86
tree: e99b1603dfe3fe7cf16d5b2e415cde77979fbbdc
  1. hooks/
  2. media/
  3. Android.bp
  4. METADATA
  5. OWNERS