Merge "simpleperf: reduce and recover from etm decoding errors."
am: 81932dc525

Change-Id: Ife0846a3ea8df69c33f0feef4ab60f17cce08fe7