Merge "Switch to system/core/janitors as OWNERS." am: b291117ce1 am: b341773687
am: f94feb3477

Change-Id: If0e625408c2aba20e22765054aada2f82cb159fa