am 170b153b: Merge "Fix library paths for SDK tools."

* commit '170b153b3e3b087f77d806323a685ca0b4597561':
  Fix library paths for SDK tools.