Merge "Fix typo in media/jni/OWNERS" into main