flo: merge tag 'android-4.4.4_r1'

Conflicts:
	WCNSS_qcom_cfg.ini

Change-Id: I2d69ec81ac71a8b67e731eb8e348618d971613e5