Merge "Clean up sdk building, use built xmllint"