Merge "Fix package-split-across-modules issue in art.module.api.annotations."