Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE"