Merge "Some files for the SDK are now built in a different place"