Merge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf
am: 1815f49dee

Change-Id: Ic4eac31d6bde6001e6beb5664b28de25bce3c96c