Merge "qemu_trusty: Fix VINTF file inclusion."