Merge "Fix undefined names used in ALOGV_IF."