Switch to modded android_system_extras

Change-Id: I210e29a937db2a03a6e8997fe39695479d04a99a