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

* commit '9b187b35f32f427dbd6af21614dfefa03177b594':
  Cleanup unused clear_vars.mk entry.