Merge "Ensures correct LOG_TAG is used by NN_RET_CHECK_FAIL macro"