Merge "Switch to system/core/janitors as OWNERS." am: 50216134da
am: e412a621b7

Change-Id: Icefd94b8bde8bab790b7a0fa533234cad578705e