Merge changes Iec082f0c,I86a479af

* changes:
  telephony/common/* should use android.util.Log
  Use com.android.telephony.Rlog for mainline module.