Switch Nexus 4 to our fork of system/core

Change-Id: Idd04c0fc89a9c3c156821f1f6460415189ca126d