Merge "media: Updates to avic_OWNERS"