Merge "simpleperf: fix supporting ctrl-c when using `adb shell simpleperf xxx`." am: b3734fda74
am: 2fa4ff8d52

Change-Id: I7f0de9ec4d706e1654c36d21dee25d0d44b48692