default: Use shipping branch as default

Change-Id: Id71c90e99896f85f7e767a6273cc0a40f4683957

Conflicts:
	default.xml