Merge "Add systrace to VerifyClass"