Merge "Include annotations in module metalava runs" into rvc-dev