Merge "telephony/common/* should use android.util.Log"