am f62832c3: am c38d287b: am 6018ca0f: am dd21f260: Merge "Support multiple variants of ftrace format" into mnc-dev

* commit 'f62832c367c35074538f5830ba94600d4f2f4412':
  Support multiple variants of ftrace format