4.4_r1.2 -> 4.4.1_r1

Change-Id: I946441c55ae81dcce53cbcc8df21e47ebd08f686
Merge branch 'cm/cm-11.0'

Conflicts:
	default.xml