auto-merger: merge in from slim/kk4.4

Conflicts:
	libc/Android.mk
	libc/arch-arm/arm.mk
	libc/arch-arm/bionic/strlcat.S
	libc/arch-arm/bionic/strncat.S
	libc/arch-arm/bionic/strncmp.S
	libc/arch-arm/bionic/strnlen.S
	libc/arch-arm/cortex-a9/cortex-a9.mk
	libc/arch-arm/generic/generic.mk
	libc/arch-arm/krait/bionic/memcpy_base.S
	libc/arch-arm/krait/krait.mk
	libc/arch-arm/scorpion/scorpion.mk
	libc/arch-arm/tegra2/tegra2.mk
	libc/include/stdlib.h
	libc/kernel/arch-arm/asm/unistd.h
	libc/private/bionic_atomic_arm.h
	libc/private/bionic_atomic_gcc_builtin.h
	libc/upstream-netbsd/libc/stdlib/exit.c
	libm/Android.mk
	libm/upstream-freebsd/lib/msun/src/e_acoshl.c
	libm/upstream-freebsd/lib/msun/src/e_atanhl.c
	linker/Android.mk
	linker/linker.cpp
	linker/linker_phdr.cpp
	linker/linker_phdr.h