Merge "Actually fix aosp_qemu_trusty build error"