Fix typo in gpu_threads rvar check

rvar-ness of all gpu vars was based on the 
rvar-ness of the block_x/thread_x argument, instead
of the rvar-ness of the matching argument.
Merge remote-tracking branch 'upstream/master'