merge master of 'DirtyHairy/android_kernel_ideapad_k1' into test