Merge kk4.4 with cm11.0