Merge "Add legacy-performance-test-hostdex target" am: f9587a35ba am: c5f2b08e83
am: ef1d2b970c

Change-Id: I1236606734e202f674cf8306b6e1734ea683dcc2