merge in jb-mr1-release history after reset to jb-mr1-dev
merge in master-release history after reset to master
Reconcile with jb-mr1-release - do not merge

Change-Id: Ice07f7813d823b0419153d5ac321ad784a690af4
am 089111a8: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '089111a80a6a167de827bf32ae2d2a935ff5874f':
Start cleaning up libm.

We have two copies of fenv.h for every architecture, one of which
isn't used. We also have unused makefiles and files for architectures
we don't support.

This patch removes all the obviously useless files.

Bug: http://code.google.com/p/android/issues/detail?id=38196
Change-Id: I1919b6621ba513aa24aa947a34815bc51191487c
Merge "Start cleaning up libm."
am b46530bd: Merge "Start cleaning up libm."

* commit 'b46530bd3e5984047bd780f5d3a6a5ebabd9f02d':
  Start cleaning up libm.
am f510fc78: am b46530bd: Merge "Start cleaning up libm."

* commit 'f510fc789a67344080543b9ae06d0ff3322561d5':
  Start cleaning up libm.
Reject .so files with no sysv hash table.

Also ensure that dlopen(3) errors always include the name of the library we
failed to open.

Also fix a bug where we'd fall back to searching LD_LIBRARY_PATH and the
built-in paths for names that include slashes.

Bug: http://code.google.com/p/android/issues/detail?id=38479
Change-Id: Ib2c009ed083344a7a012749d58f8679db2f26c78
Merge "Reject .so files with no sysv hash table."
am c0ac7eba: Merge "Reject .so files with no sysv hash table."

* commit 'c0ac7eba934fb88f321c75a71312ea482e9a85e9':
  Reject .so files with no sysv hash table.
am 1de3af51: am c0ac7eba: Merge "Reject .so files with no sysv hash table."

* commit '1de3af51d459c2ced602f10e4f7e7fe704400cdc':
  Reject .so files with no sysv hash table.
merge in master-release history after reset to master
Dynamically allocate soinfo-structs in linker

Request memory from the system when needed instead of having a fixed
array for soinfo structs. Note that malloc() et al can't be used in
linker, so use mmap() instead.

Change-Id: I4b495995931d7752b0e8c944e64d1fe41b9f7144
Merge "Dynamically allocate soinfo-structs in linker"
am 0be1819b: Merge "Dynamically allocate soinfo-structs in linker"

* commit '0be1819b22b33fbedcb150f96a196ed096abe2fc':
  Dynamically allocate soinfo-structs in linker
am 3bb62578: am 0be1819b: Merge "Dynamically allocate soinfo-structs in linker"

* commit '3bb62578beb36a35d3b1d2fbe18bd34a9d4ecca4':
  Dynamically allocate soinfo-structs in linker
Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too.

Also remove an unnecessary #include and a now-obsolete TODO.

Change-Id: I36d923721e349a286934b9534090a67ce0786e7b
Merge "Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too."
am 064f862d: Merge "Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too."

* commit '064f862d557ab741575dfae479499a07ca0ab742':
  Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too.