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

Change-Id: Idf1ecf65a9a4d1dc11c37e824ce876543da8efaa