Merge "Don't pass annotation srcs to metalava for modules" into rvc-dev