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

This reverts commit debd40f9d72128f30c637cfeefb0fb9e3bf52524.

Change-Id: I94969744ce55620b225db93a4fc6490f3dd73e3b