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

Change-Id: I59124a707fb1f85b6506c0995d4810e2f968dfcb