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

Change-Id: I797e4c49148018b9d828632a11dc35dfa9c95b11