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

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

Change-Id: I71f9148359c0d1ccd3cbb10c7e4cfba54c9eca14