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

Change-Id: I5ebf1bfdb516ca6b8541fb9388a85db75d46445f