am 630e81ab: am 9b187b35: am 20f4a364: Merge "Cleanup unused clear_vars.mk entry."

* commit '630e81ab99d546d7f99228bca6e21b1a4f9749e0':
  Cleanup unused clear_vars.mk entry.