Merge "ffs was not being built for x86."