Merge "simpleperf: fix test record_cmd.post_unwind_option." am: 44e68d9bae am: 550a0b5333
am: a0be0ae54d

Change-Id: I01132ad7f304a9f98be0679d3287dd06a4bf72fe