Support multiple variants of ftrace format

bug:23241102

Also updates expected list of trace strings

Change-Id: Ibafa7be87e42ce418a5e1c128aa2e5804eada7d5
1 file changed