Merge "Sort clear_vars.mk again" am: 05106468f8
am: 03b7efd871

Change-Id: I211ea6e5e596f752a62fbf47994fbcaaca01cd4d