Revert "Revert "flo: merge tag 'android-4.4.4_r1'""

This reverts commit 2fa8c78bc28a428659484ea228648645c7813f64.

Now that kernel sources are merged, Wi-Fi, BT, GPS all work again.

Change-Id: I8ad6486a02e806dbc050dcc475eafc96018ca85c