Merge "Revert "run-test: Ignore OUT_DIR flag""