Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"