Merge "Fix OUT_DIR usage"