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

Change-Id: If850e4ff9da2b0c1259a366caac1fd95a8eb1c3c