Merge "Update catapult to latest version (c4d3ff474)" am: 9755dd361c am: ec0eeb40ca am: 69d5b2cbb3 am: 3cc94fdbad am: 291200ddfa

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

Change-Id: Ib50d6a99a895d13bb1a19cef59d5867b82ce7627