Merge 1d8fdd22477b903e1d8d7d1bb2d294b80bd19ddd on remote branch

Change-Id: I307b7db54ec8753908ef2cf083777b565042c580
tree: 24ce725e4e7d3d9cccf2df15100cb13f9ca012dd
  1. hooks/
  2. media/
  3. Android.bp
  4. METADATA
  5. OWNERS