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

Change-Id: I72032258d9436a821d69a45e2f368b444ff63ece