Merge "Sort clear_vars.mk again"