[Build] Invoke xbuild once now that build order is fixed