am 3b1cb037: am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"

* commit '3b1cb037eea56dba0d134c6858f8ddc0f9743ff8':
  make struct Event layout consistent on 32/64-bit