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

Change-Id: I63808e7bd913d228a586e5ffce1373f3b5ec541e