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

Change-Id: I511ec41c3fe6523a9747d827299194749feece81