Merge "Fix a dead lock between garbage colletion and sample-based tracing." am: 50caa3d20e am: 2661363b20
am: d7da6b997a

Change-Id: I94def956e7caf33f4f23ab271e705070019e46b1