am 000a2d60: (-s ours) Use telephony-common and mms-common - DO NOT MERGE

* commit '000a2d60577d4df1e87b70955a814067fd5fcb31':
  Use telephony-common and mms-common - DO NOT MERGE