Merge "Correct path to files in core/res/OWNERS"