Some minor cleanup of cleanup in Makefile Upstream-commit: c5051ea0ea506e375a85f66ad5bd0666deabfcc6 Component: engine