Merge branch 'android-msm-flo-3.4-jb-mr2' of https://android.googlesource.com/kernel/msm into cm-10.2