Merge upstream from M1cha:cm-11.0

merge new change from https://github.com/M1cha/android_kernel_xiaomi_aries