Merge "Bug fix on 32-bit vs 64-bit movd/movdq on x86_64."
am: f6dcede656

Change-Id: Iab20ff6a29f35b09ed0329aa99fad16c45678848