Manual merge from github.com:kbc-developers/android_kernel_samsung_jfdcm kbc-aosp-jb-mr2