Merge "Update catapult to latest version (c4d3ff474)" am: 9755dd361c am: ec0eeb40ca

Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1393847

Change-Id: I850c63800eb0a906162dcfa6b918d4740414eb75