Merge commit '377529c009e3fce480d9c233bb3238b14a950816' into upstream-merge

Merge commit '377529c009e3fce480d9c233bb3238b14a950816' into upstream-merge

* commit '377529c009e3fce480d9c233bb3238b14a950816': (64 commits)
  move feature variables to the top
  default make and install to environment variables
  default compilation tools to environment variables
  microblaze: Improve unconditional direct branching
  cris: Set btaken when storing direct jumps
  slirp: Use strcasecmp() to check tftp mode, tsize
  ppc405_uc: fix a buffer overflow
  lan9118: fix a buffer overflow
  vpc: fix a file descriptor leak
  qemu-io: fix a memory leak
  vvfat: fix a file descriptor leak
  loader: fix a file descriptor leak
  vnc-auth-sasl: fix a memory leak
  audio: split sample conversion and volume mixing
  disas: remove opcode printing on ARM hosts
  arm-dis: Include opcode hex when doing disassembly
  tcg arm/mips/ia64: add a comment about retranslation and caches
  linux-user: Add configure check for linux/fiemap.h and IOC_FS_FIEMAP
  ARM: Fix decoding of VQSHL/VQSHLU immediate forms
  ARM: add neon helpers for VQSHLU
  ...

Conflicts:
	configure

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>