Merge remote-tracking branch 'aosp/android-msm-flo-3.4-kitkat-mr0' into HEAD

Change-Id: I1336e7fdb8097cbf0a6139611122c9c8b06f048d
Merge remote-tracking branch 'aosp/android-msm-mako-3.4-kitkat-mr0' into HEAD

Change-Id: Idd0b37d5b414e659e131b98cbd73b7ea4cff4899