1.0.20.16: make LOCK and FS prefixes part of the affected instruction

1.0.20.16: make LOCK and FS prefixes part of the affected instruction

 * Disassembler still shows them as a separate instructions, but
   in assembler the prefixes become postfixes to the instructions they
   modify: (INST MOV X Y :FS), etc.

 * Not only does this reduce the amount of conditionalization, but
   making prefixes part of the instruction they modify seems necessary
   if we ever want to turn on the instruction scheduler on x86oids,
   and is probably needed for a peephole optimizer as well.

 * Also fix x86-64 build: missed one ALIGN to EMIT-ALIGNMENT renaming.