Merge "Revert "Updating trace processor prebuilt to include new display_metrics""