root: Update for 4.4

Change-Id: I651b7657b663e8bb4b6d1f17b35277cbf7c88516
Merge branch 'cm-11.0' into martincz