Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES""