substitute (apparently identical) patches from 1.4.0 qemu-linaro rebasing tree.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>