Merge "Do not disable tracing in zygote." am: 88be2985c4 am: aee51d9eab

Change-Id: I8b6280d305ea53c5361442e4b7bb45aa164fb5d2