Add telephony-msim to the build

Change-Id: I6e18f97ce162476a8d3c339997005d1515361306
4.4.2_r1 -> 4.4.2_r2

Change-Id: I88d21c3cfd138dd8d5b23c23b5d294c138663850
Merge branch 'cm-11.0' of github.com:CyanogenMod/android into tfkk-4.4

Conflicts:
	default.xml

Change-Id: Id4891fc5aa4e2bcd0425690c7280b14c30c53d31