Use our system/core to avoid errors in build

Change-Id: Idcf61de68f90326f42d8657dc10cdd598f8e4c61