Revert "flo: merge branch 'android-msm-flo-3.4-kitkat-mr2'"

This reverts commit 388b2b8cb48f2771a81ade7a5bc41cb5d13d28bd.

going to perform non-squashed merge

Change-Id: I4bf44921310812b75902647516f62ae94bff1697