Merge "simpleperf: fix *handle_SIGHUP tests." am: ad48d21a88
am: 2156d8b1e9

Change-Id: Ie066b9ff85badbc4a07f7b2dc696049421a81610