am 633b5ed5: Merge change 8178 into donut

Merge commit '633b5ed51b9877f36b8248d6d0fc96870768e8b5'

* commit '633b5ed51b9877f36b8248d6d0fc96870768e8b5':
  Ensure LOCAL_LDLIBS is cleared by the $(CLEAR_VARS) script