4.4.1_r1 -> 4.4.2_r1

Change-Id: Ibb2c771339e19d53963eff10de9bc530cde2a271

Conflicts:
	default.xml
clean up for 4.4.2!!!