Merge "testframework: adding few more macros for systrace c interface support"