Merge "Fix undefined error in ALOGV_IF."
am: 1949fae278

Change-Id: Ia1c398425ea6c034d2bd2eccf2cc7beedf59212c