Merge "Switch to system/core/janitors as OWNERS."
am: 72396f9112

Change-Id: I10f90c0e5342613f3a05c5e497d402ced8f0ac72