Merge \\\\"Remove qemu_tracing dependency.\\\\" am: ed5fd6fd5c am: 23b9da5fce am: 6ab5cc6336
am: 717400c455

Change-Id: I4a65c5b978e0d76b7e35a4098abe3b4d10f806ca