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

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

Change-Id: Iaa6fef09d09666f61be26c30538ca67ba7122b8b