Merge "Don't disable vendor tracing when --only_userspace"
am: 957a41937b

Change-Id: Ie5e1b40ce54a63bbe947ec8f5e74654fe80b3b5f