Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE"