Bump to 4.1

Change-Id: Icff26a2271088881721ad43e23cd8d8148ee0f9a
Merge remote-tracking branch 'upstream/kk4.4' into kk44s