Merge "Make libEGL build cleanly under 64-bit"