Merge "Fix missing xml configuration files for sdk builds"