Merge "Sort and reorganize clear_vars.mk to make merges easier" am: e26036ad5e am: 0ab11a22ba  -s ours am: 54fcb1a61f  -s ours
am: 7695288ca3  -s ours

Change-Id: Iaa1087247d9993f05d245beee99fdf740ef48a3a