Merge "Atrace: Add commandline flags to enable/disable userland tracing" am: 402085b98c
am: 9800f756e8

Change-Id: I7a5b7c93dab6600d526e443a95d8ebcf1b0fdec9