Revert "Merge branch 'android-msm-mako-3.4-jb-mr2' into nexus-4"

This reverts commit ae9425115014927beb839455c9d90814cd9208b3, reversing
changes made to a33443c022e613ddf47bc8dcd2b07d9877f42c61.