Merge "Cleanup unused clear_vars.mk entry."