Merge "simpleperf: fix potential unaligned memory access." am: 695d719bae
am: 62ffb7fba6

Change-Id: I60e1200c28194619b0e6ff1546934487c6f277e2