Merge "Fix MmtpRecordEvent and TsRecordEvent NoSuchMethodError crash in jni" into sc-dev