Merge "Revert "Remove legacy-test and legacy-android-test targets""