commit 2e544837e7acb479c3e4e22f53835e9740800af7
author Christopher Ferris <cferris@google.com> Thu Aug 15 19:20:43 2013 -0700
committer Christopher Ferris <cferris@google.com> Thu Aug 15 19:27:08 2013 -0700
tree ea1e26b29309f4d81b853e9686786bffa62ff90e
parent 11855d4789501956c546604a35d5e56da280040c
parent cf0529946a0ffd07e94785102965656768e455e1

Merge commit 'cf052994' into manualmerge

Fixing merge conflict and pulling in all of the changes that I stupidly
marked as not requiring a merge.

Conflicts:
    libc/arch-arm/arm.mk
    libc/arch-arm/cortex-a15/bionic/memcpy.S
    libc/arch-arm/cortex-a15/bionic/memset.S
    libc/arch-arm/cortex-a9/bionic/memcpy.S
    libc/arch-arm/cortex-a9/bionic/memset.S
    libc/arch-arm/cortex-a9/cortex-a9.mk
    libc/arch-arm/krait/bionic/memcpy.S
    libc/arch-arm/krait/bionic/memset.S
    libc/arch-arm/krait/krait.mk

Change-Id: I5da280dd8700681f118719c964a4d13446db51db