Merge "Merge "Remove legacy-test and legacy-android-test targets" am: 14daedf747 am: 4a83feb18a am: 9248379c98"