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

Change-Id: I58e224511b5038c987a1667b372b53039b94696d