Merge "Revert "Remove full api surface from-text stubs java_api_library..."" into main