Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I5a5b95da6c33afbc36893e162f3b57c09c161ee2
am 918e6a73: Reconcile with jb-release nakasi-factoryrom-release

* commit '918e6a730cd059392ee6d8b5c5a0f5fa0e5bbd93':
  Revert "linker: remove STB_LOCAL hack"
  Revert "Reference __dso_handle in PIC way"
  Revert "Use the new NativeDaemonConnector style."
  libc: Add __aeabi_llsl and __aeabi_llsr to libgcc_compat
am cd6b2007: (-s ours) Merge "Add linker support for PIE"

* commit 'cd6b2007b851f1cfa47d8bcc7ec859dfa7557382':
  Add linker support for PIE
am 1adc7c03: Merge "linker: Fix the computation of si->base"

* commit '1adc7c03898ee1f6a4c7f8cffa3c07507b9da5a9':
  linker: Fix the computation of si->base
am 36e0345a: Merge "linker: set LOCAL_NO_CRT := true"

* commit '36e0345af89e2ed768ed38dcdf016a7640cf8ba5':
  linker: set LOCAL_NO_CRT := true
am cf8e554c: (-s ours) Merge "Make the linker relocatable."

* commit 'cf8e554c72af1dd634d4f36a9065e34e853f8714':
  Make the linker relocatable.
am c62d55cb: am cd6b2007: (-s ours) Merge "Add linker support for PIE"

* commit 'c62d55cbaef8001c7eb0a8d5e85e2fc72283063a':
  Add linker support for PIE
am ee6916c0: am 1adc7c03: Merge "linker: Fix the computation of si->base"

* commit 'ee6916c00718185df3930a18050e5b47685ef524':
  linker: Fix the computation of si->base
am 574e8ec2: am 36e0345a: Merge "linker: set LOCAL_NO_CRT := true"

* commit '574e8ec28fac106a5e9b2c98b7b5a4e9532ecf5c':
  linker: set LOCAL_NO_CRT := true
am 1727a041: am cf8e554c: (-s ours) Merge "Make the linker relocatable."

* commit '1727a041b59995b00c1d497022600be929bcaf3e':
  Make the linker relocatable.
am 70cf0bc0: Merge "Remove the last references to SuperH."

* commit '70cf0bc0496a1d4c0e83fe3f1933f667ab66c148':
  Remove the last references to SuperH.
am c7882ab2: Merge "bionic: add clean kernel header ucontext.h"

* commit 'c7882ab2a99a74c8f772ab03fdfd9a3b53515e46':
  bionic: add clean kernel header ucontext.h
resolved conflicts for merge of dc6c2b77 to master

Change-Id: Ifab4573a825cf5caa7158d8888243bb8d5d01148
am d155ba57: am c7882ab2: Merge "bionic: add clean kernel header ucontext.h"

* commit 'd155ba57a32ce3182d8a5b79ff27bc5e7fa55df9':
  bionic: add clean kernel header ucontext.h
am c84ff11d: Print the corrupted address passed to free().

* commit 'c84ff11dad26435dc5760bceda18e8f1175a6061':
  Print the corrupted address passed to free().
am d7b60b20: am c84ff11d: Print the corrupted address passed to free().

* commit 'd7b60b207be79513b99faf2ef576db333f9c7a78':
  Print the corrupted address passed to free().
Use mmap to read an initial ELF header of library

Also, fixes SIGSEV during calculation of si->phdr in load_library(),
which is caused by accessing PHDR area, which is not guaranteed to be
loaded.

Note that this usually does not happen because program header area is
covered by immediately following PT_LOAD entry.  But it does not hold
always.

Bug: 6561258
Change-Id: Ie376253c773b5420279ca89044e81b1aad5a5736
Merge "Use mmap to read an initial ELF header of library"
Reconcile with jb-release

Change-Id: Id0b365ef6729dc36b88193f1675d3819e56bd426
am cb9ba3c8: Reconcile with jb-release

* commit 'cb9ba3c88a97f34784559a55317ff5970d4c4dba':
  Print the corrupted address passed to free().