Merge "Add qemu-user-static to cross-base"