Merge "Merge "Add legacy-performance-test-hostdex target" am: f9587a35 am: c5f2b08e am: ef1d2b97" into nyc-mr2-dev-plus-aosp