am 0da82a6f: am 689a7f30: am 851b2cb1: Merge "Make libEGL build cleanly under 64-bit"

* commit '0da82a6f0d5b7f6466aa4622fc4cf1547f208499':
  Make libEGL build cleanly under 64-bit