Merge "Add java_system_modules for current sdk stubs"