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

Change-Id: I400acce77d938deb2bdfeeaf3a9607ca818eab39