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

Change-Id: I4dbbea69061a15e55f70dc83df8d80a81a92f2d2