Update upstream ref to latest 4.3 tag

Change-Id: I72651c0f1efef09c8e9cb5ab2258c6a335489b2f
Merge branch 'cm/cm-10.2'

Conflicts:
	default.xml