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

Change-Id: If9dcbc968b4fba717bd9acffadb5f30349a5a546