Merge "Remove legacy-performance-test-hostdex" am: a0cdd72604
am: b8c97764d8

Change-Id: If3eba00c8f513e5f53a69afff9aef5789f26a3f4