Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."