Merge "Remove unnecessary module_libraries @SystemApi annotation" into sc-mainline-prod