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

Change-Id: Ia912ee952fbe650173ee0748af4e2cd95bd93d7b