Merge "Fix undefined error in ALOGV_IF."