Add telephony-msim to the build

Change-Id: I6e18f97ce162476a8d3c339997005d1515361306

Conflicts:
	default.xml
Merge branch 'cd-4.4' of ssh://yauniks.dynvpn.de:29418/CyanDreamProject/android into cd-4.4