Merge "Modify traceview to sample instead of instrumenting methods." into dalvik-dev