Merge branch 'cm-13.0' of https://github.com/cyanogenmod/android_kernel_htc_flounder into android-6.0