Cleanup build tmp dir stuff Upstream-commit: 308ecafad87b5ef9921a8ff2c471f4b410b35107 Component: engine