Merge "Sort and reorganize clear_vars.mk to make merges easier"