Merge "Sync media/OWNERS"
am: b5d34b3e03  -s ours

Change-Id: I7a831bb3323bab6fc1576960fcb121504ae173ed