libgltf: include is missing from fmod_error_handling patch, merge patches

Change-Id: I9e0e7816e6d85cb3484105de4ce49db47db72451