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

Change-Id: I9c61cccb787982547de4114889833ffa59a87235