Merge Extend and Shift into a UBFX
tsan: address comments in r214912
See http://reviews.llvm.org/D4794