Merge "Compose the main stubs jars from module stubs" into rvc-dev