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

Change-Id: Ia346919392cfcf9a53018dd4d284865d1795940c