Merge "Fix build warnings for x86+arm targets"