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

Change-Id: Id955277ff96e8b0dc3af8919b03d7bd53a3a1680