Merge "Fix package-split-across-modules issue in art.module.api.annotations."
am: 0e379e57dd

Change-Id: Ifd7f248b47ea55f275c668728336c645e1be1497