Merge "make struct Event layout consistent on 32/64-bit"