am 4f0a12a9: am 7076e464: Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"

* commit '4f0a12a9306f13fb6208c7f43c8a355ed48d8cc5':
  Add 64-bit software GLES/EGL support in gralloc.goldfish module