Merge "Zygote: Avoid string concatentation for systrace" am: 8bcd159234 am: fdfc79a878 am: 8a8f33416b
am: f836fec287

Change-Id: I767c6f790412c2453ed1a4288548fe6139113dbe