Merge "Fix SIB for base + index addressing in x86_64 assembler."