Switch to ami-6f1b4406

Finally with the correct version of xbuild.