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

Change-Id: If7f16f7bf024659c71770ccce03141edf694d561