Merge "Remove stub-annotations from java-current-stubs-system-modules"