Merge "fix crash when validating an invalid EGL objects" into ics-mr1