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