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

Change-Id: Ia63a4b26d32d8aa2d09707e64932c00db843cd78