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