Fix MAP SDP record generation [1/3]

This change adds support for generating MAS and MNS SDP records.

Change-Id: I54d5d5847b9cdf4bd5e03aadf4e5012540e669c0
merge changes from remotes/github/cm-10.1 into master