Merge "Atrace: Add commandline flags to enable/disable userland tracing" into pi-dev am: a46412ea43  -s ours
am: 418d963ebf  -s ours

Change-Id: I92296122500ff6c523a6dbae538c71981b032fae