am 0275bc68: (-s ours) Use telephony-common and mms-common. - DO NOT MERGE

* commit '0275bc68eae54a882bb27e534ca401fad3acc663':
  Use telephony-common and mms-common. - DO NOT MERGE