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

Change-Id: I9f048c9de2311db781b0f6599af35ddb09a9f216