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

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

Change-Id: I7fdec5b463a79e3f57794e9e74f41fbe45d5cf3d