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

Change-Id: I60b8b084e4db3d041cd9fdebd789e7b2b797312c