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

Change-Id: I8e42681d399a5b3f96505572ff456a76318e6a04