Merge https://github.com/bilalliberty/android_kernel_htc_liberty-villec2.git