Merge "Switch to system/core/janitors as OWNERS."
am: 30bc66eb20

Change-Id: I493f31f40b2807c5778c92f2ceb50e24b3031835