am 47de3060: Merge "Fix element size on 64b"

* commit '47de306050576535014ff2b0c08006f951eea2ee':
  Fix element size on 64b