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

* commit 'e0f3196e3a65d06874c21639ae4d5db7d82f0f78':
  Fix library paths for SDK tools.