Merge "Fix aosp_qemu_trusty build error"