Merge "Switch to system/core/janitors as OWNERS." am: 5bd64cef55
am: 57e1066084

Change-Id: I8b33475b603df0b0c87e69b5bdc5f226bf272765