Update AOSP repositories to android-4.3_r3.1

Change-Id: I36363369e987039f869436fc822e030725f0512d

Conflicts:
	default.xml