Merge remote-tracking branch 'khronos/master' into aosp/deqp-dev