Merge "Move per-file OWNERS directives to their directories."