Merge "Clean up sampling tracing." into dalvik-dev