Merge "Fix sign extension issues in x86_64 code generation" am: 9bb8928a8e
am: 2a6c31581c

Change-Id: I31fb4d5e1387d7b2cc65fbecc8ca6cd75a1da053