Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE"