Merge "Merge "Revert "Remove legacy-test and legacy-android-test targets"" am: 049c1589 am: 7f997d4c am: 95a9dc90"