Merge "Remove unused systrace-sdk-zip build rule" am: 2cb26420f8 am: dd9cae507b

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

Change-Id: Ia995052e7dc8250d43c2c6bb6d80fcaaad26573a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>