Upgrade to dlmalloc 2.8.5.

Move dlmalloc code to upstream-dlmalloc to make pulling upstream changes
easier.
Declare pvalloc and malloc_usable_size routines present in malloc.h but with
missing implementations. Remove other functions from malloc.h that have
no implementation nor use in Android.

Change-Id: Ia6472ec6cbebc9ad1ef99f4669de9d33fcc2efb4
Revert "Upgrade to dlmalloc 2.8.5."

This reverts commit 5037b101df060ea6a86667b8bc19e534b337e58d.
Merge branch 'jb-release' of https://android.googlesource.com/platform/bionic into aosp
Fix <sys/klog.h> to correspond to the kernel operations.

This makes the constants correspond to those in the Linux kernel's
include/linux/syslog.h, but keeping our old badly-named constants for
source compatibility.

Change-Id: Ia47d1299205754cbfffd29ed48b497b53d1edaae
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/bionic into aosp-merge
Merge "Fix <sys/klog.h> to correspond to the kernel operations." into jellybean
Revert "timezone: data file should be 32 bit aligned"

This reverts commit bc0b877a507f394001bb133891032d65e04cd106.
Revert "memmove: Fix the abuse of memcpy() for overlapping regions"

This reverts commit af820b84625a14eaf199c82c6b4a8773b145668f.
Revert "bionic: Update mechanism to detect number of CPU's for msm targets"

This reverts commit a2e0be9822c9bbb0e6bc479ee970bdfed20e8ec9.
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/bionic into mr1

Conflicts:
	libc/Android.mk
	libc/bionic/system_properties.c
	libc/kernel/common/linux/msm_mdp.h
	libc/tools/gensyscalls.py
	libm/Android.mk
	linker/linker.c

Change-Id: I11944300d7fcf2fd9dc587d8c7a937bf5366bcc0
linker: restore prelink support

Prelink support is required to load old vendor binary blobs
on many devices properly

This commit partially reverts 4688279db5dcc4004941e7f133c4a1c3617d842c

Change-Id: Ibc835095579c0bbd18aff61f37bd420de353e94d
Revert "sha1: Use bswap* to optimize byte order"

This reverts commit 259b660f6a51be7f627e7c2a6376af0b21b55fbb.
This was triggering the new ssp checks and killing processes
bionic: Optimizations for gettimeofday and clock_gettime.

Use the kernel user helper feature to calculate the results
of gettimeofday and clock_gettime without actually calling
into kernel space. If the user helper patches have not been
applied to the kernel, the regular system calls are used as
a fallback.

Change-Id: I3aebc6ac19ab4743725648a1a279819e624cc5c4
timezone: data file should be 32 bit aligned

The zoneinfo.dat file is memory mapped and then read as an int array.
On some platforms this is causing alignment errors (SIGBUS) because
the records are not 32 bit aligned.

My changes: Fixes for 4.2 and also updates zoneinfo to the latest version

Change-Id: Ieea8ef07e49ef86d139c52ebfccf4159c0ebd887
FORTIFY_SOURCE: fortify strchr

Detect when strchr reads off the end of a buffer.

Change-Id: I0e952eedcff5c36d646a9c3bc4e1337b959224f2
FORTIFY_SOURCE: fortify strrchr

This change compliments 049e58369c37fdeacd0380a6bf1e078d9baf819f

Change-Id: I27d015d70a520713c7472558a3c427f546d36ee4
x86: Add missing bionic/memmove_words.c to x86 source to list.

This was causing libdvm to fail with undefined references
when building for the mini_x86 target.

Change-Id: I3c3af3acc87b46c660bf8f46339dfa0509c14c01
Merge "timezone: data file should be 32 bit aligned" into mr1-staging
bionic: Add ARMv7 optimized string handling routines

Add ARMv7 - and especially Cortex-A9 - optimized string handling
routines based on the versions found in the cortex-strings library.

Change-Id: I497075bea5b82aef8989625bdec512029676fe7f
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
libc: extend ARCH_ARM_USE_NON_NEON_MEMCPY to linaro

Change-Id: I8f8e000cc56928ba77d21c6066a11cb16ca5b7af