Merge "Revert "Revert "Updating trace processor prebuilt to include new display_metrics""" am: 5e29761bc3 am: 1eceef6463

Change-Id: I1f2dbcfe848848da72a2a6af10d4bd0b569cbd04