Merge "Remove java_api_contribution modules from .bp files" into main