Merge \\"Build: Fix vendor sanitizer library for secondary arch\\" am: 2302a76966
am: 80b32402dc

Change-Id: I6b59928b0d37aadbc29b9162521340062ec7d979