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

Change-Id: I105f07f2b2ca925139da6fc78641ee486eb68410