am 20f4a364: Merge "Cleanup unused clear_vars.mk entry."

* commit '20f4a364a83d9a3906d3cf8b866d00437f8ff2d4':
  Cleanup unused clear_vars.mk entry.