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

Change-Id: I045b73abad1af7f0e873ee8657227df369369d12