Rebase integration branch, rebase, update refs.

Update qemu repository. Tweak the SConstruct in PTLsim to match
changes in the qemu Makefile that occured during the last wave of
commits.