Merge branch 'android-msm-flo-3.4-lollipop-release' of https://android.googlesource.com/kernel/msm into cm-12.0

Change-Id: I05d3182f25386b3e3a069cf8bdc93f6bcede89b3