Merge "2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"