Merge "Merge "Add legacy-performance-test-hostdex target" am: f9587a35ba am: c5f2b08e83 am: ef1d2b970c" into nyc-mr2-dev-plus-aosp