Merge "Build: Fix vendor sanitizer library for secondary arch"