Merge \"Remove qemu_tracing dependency.\"
am: ed5fd6fd5c

Change-Id: I57bcff07288ff9210a0c27d264f587590ed44895