Switch to our system/core

Change-Id: Ie21129fc0e38a9bcff72a2e41e1988f8ff099259