Merge "testframework: systrace c interface changes"