Merge "Remove lint-baseline in staticlibs" into main