Merge remote-tracking branch 'strace/master' into cp

Conflicts:
	configure.ac
	file.c
	linux/dummy.h
	mem.c
	net.c
	process.c
	signal.c
	syscall.c

Change-Id: Ib7acdaefedb621e2dd0c292b80781d0d6e1f7e5c