Merge tag 'android-4.4.4_r1' into HEAD

Android 4.4.4 Release 1

Change-Id: Ic9cc24af8c3b38bca4d44235245888a4761e144e
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	ssl/s3_clnt.c
	ssl/s3_pkt.c

Change-Id: I775a4215eebbf4f5562feabf619c49d583391d1f