Merge "Dedupe build rules for non-updatable sdk libs" into main