Merge "simpleperf: respect inherited SIGHUP disposition." am: 2a2f59c867
am: 60df128721

Change-Id: I7fd93743aba7cd85aaba71d93c88fb15526677e1