Merge "Convert telephony-common from .mk to .bp"