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

Change-Id: Ic4cd48366dbb48449519b9c023c9360ea8dcdeb0
Signed-off-by: doc <doc.divxm@gmail.com>