am e2066293: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"

* commit 'e2066293e8279641d4abd13ec3fbdd6f42def83d':
  Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE
am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"

* commit '632fd5183a611b80e009be36f881f572acc41619':
  Fix strcpy.c that should have been strcpy.S. DO NOT MERGE
am ee48fed5: Merge "Add futimens."

* commit 'ee48fed51894f3db324e957058ed2ddcf23dddc7':
  Add futimens.
am c933493a: Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."

* commit 'c933493ac28c40558f369d175da738ba601d8499':
  Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
am ff9b7aa6: Merge "Make ctype.h a little less unhygienic."

* commit 'ff9b7aa695bd4860c0551b8899f2f26311174855':
  Make ctype.h a little less unhygienic.
am 5e4a2f31: Merge "Update kernel input headers"

* commit '5e4a2f3174485678d461d6b0eeb11a5e9a32e531':
  Update kernel input headers
am c85e0dbb: Merge "Add more information to error due to truncated Elf32_Ehdr"

* commit 'c85e0dbb0b8d602f930cf7ae99901730c1c6a26a':
  Add more information to error due to truncated Elf32_Ehdr
am c5cf5370: (-s ours) Merge "Optimize __memset_chk, __memcpy_chk. DO NOT MERGE."

* commit 'c5cf53701a5e04aeead70b1298bb38c51633e96d':
  Optimize __memset_chk, __memcpy_chk. DO NOT MERGE.
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
am 4eacb341: Merge "Fix pthread_getcpuclockid."

* commit '4eacb34132b3162cc3716edfee8bad528d84c16f':
  Fix pthread_getcpuclockid.
am c8039337: Merge "Change hard-coded temporary directory."

* commit 'c8039337e3ee608e23f8ca6e5ea123d938b08029':
  Change hard-coded temporary directory.
am bb34907f: Merge "Make mips_relocate_got tolerate a missing got"

* commit 'bb34907ff5f60cf1600e83ea1bb4a6c26da6854e':
  Make mips_relocate_got tolerate a missing got
am c44205cf: Merge "Work around tzcode\'s reliance on signed overflow."

* commit 'c44205cf717fc8ab8ccaf3631032fa236ba61a86':
  Work around tzcode's reliance on signed overflow.
am 41f08abf: Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."

* commit '41f08abf3d020ad8b48ff4151f8c623a119790e0':
  Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
am c6135ba7: Merge "Change how DNS resolver handle no default iface"

* commit 'c6135ba76db027d85751f84bf648a865609c0e1b':
  Change how DNS resolver handle no default iface
am 33dd7c11: Merge "Add explicit -m32/-melf_i386 for x86 target"

* commit '33dd7c116d652223b5bf3dabe49641c310d1216b':
  Add explicit -m32/-melf_i386 for x86 target
am 22f5ef6b: Merge "Delete CAVEATS / fix spelling."

* commit '22f5ef6b84057bf56f023263859a9b45eccd620b':
  Delete CAVEATS / fix spelling.
am 1f216e30: Merge "Create bionic unit test library for use with CTS."

* commit '1f216e30b6a9301211193d05f995cdefbdc9619f':
  Create bionic unit test library for use with CTS.
am 2557433d: Merge "Change hard-coded directory."

* commit '2557433d8ea4c489f061170822f34f038b930b96':
  Change hard-coded directory.
am eb8f3622: Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"

* commit 'eb8f36223e51db626a23b8032f03c095be80998b':
  FORTIFY_SOURCE: introduce __strncpy_chk2