target/arm: Fix ubfx et al for aarch64

The patch in 59a71b4c suffered from a merge failure
when compared to the original patch in

  http://lists.nongnu.org/archive/html/qemu-devel/2016-12/msg00137.html



Signed-off-by: Richard Henderson <rth@twiddle.net>