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

Change-Id: Idf2063568d8fdfa90a85c37b0944c124a705320d