resolve merge conflicts of 297d0b5c to deqp-dev