Merge "Fix build with new host toolchain"