Patches for Trusty build with multi-arch support