am 851b2cb1: Merge "Make libEGL build cleanly under 64-bit"

* commit '851b2cb18c329e0d19f9f56f68425b714007a274':
  Make libEGL build cleanly under 64-bit