Merge "Fix library paths for SDK tools."