Merge "Fix discovery of Darwin SDKs"