Add telephony-msim to the build

Change-Id: I6e18f97ce162476a8d3c339997005d1515361306

Conflicts:

	default.xml
Clean up after QCRIL merge

Change-Id: I63068cecf671a50364f95f35e28af88a3c52625e
Merge branch 'kitkat' of github.com:AOSPA-legacy/manifest into default

Conflicts:
	default.xml

Change-Id: Ie7e5e6a38f14b09e5f48ec8b5588168702a1876b