Merge "Merge "Remove legacy-test and legacy-android-test targets" am: 14daedf7 am: 4a83feb1 am: 9248379c"