Merge "Remove legacy-performance-test-hostdex" am: a0cdd72604 am: b8c97764d8 am: 1086c832ca
am: 6c5ff5674f

Change-Id: Ia0f8fa41060d3bce1e81ba26b86d265888423d73