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

Change-Id: I8edbb7b4307ddff51023f3781bc0b0d0d53b9acb