Merge "Move per-file OWNERS directives to their directories."
am: 2a7c887198

Change-Id: I998b37ef83abd16e7a899e63c59f771b0555b6e3