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

Change-Id: I7369597806d3f5710f70d5db6cfc1bce24d3b144