Merge "Revert "Revert "Move java_api_library modules to f/b/api/StubLib..."" into main