Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"