Merge "Fix texture image internalformat/type validation."