Use my system/core repo

Change-Id: Ib041e08895be74bdf7a5c9f9895ef6411c3bb50e