am 143df89f: Merge "Clean up reentrancy cruft."

* commit '143df89f729f39f4286f12daaf9cacf5c4501357':
  Clean up reentrancy cruft.
Merge "Update libm to the upstream head (2014.03.13)"
am f212bbf6: Merge "Update libm to the upstream head (2014.03.13)"

* commit 'f212bbf666b77777063a3a94a672bcae80b15253':
  Update libm to the upstream head (2014.03.13)
Use the float/double assert macros.

The normal ASSERT_EQ macros don't work quite right for float/double values,
and result in false failures. Use the correct macros instead.

Bug: 13511379
Change-Id: Ic2feee7f3d3569f57b6453b8fa95222846c625cd
Merge "Use the float/double assert macros."
am 849e162d: Merge "Use the float/double assert macros."

* commit '849e162d3bedc5ca61bdf15486268b253b9f4e93':
  Use the float/double assert macros.
FORTIFY_SOURCE: don't define s?printf macros if already defined

Clang specific: Don't #define sprintf and snprintf macros if they
are already defined.

Change-Id: I30fc507d898377e1b8a57a65a147926229e0f9e2
Added a test flag to bionic run-test targets.

It makes it much easier to pass arguments to the tests.

Change-Id: Ia91eba4868627a3cea3f8d2c26ba01af4e860b12
Merge "Added a test flag to bionic run-test targets."
am 2cc58603: Merge "Added a test flag to bionic run-test targets."

* commit '2cc58603d5fd68ec582984318fb3c5f8865a186f':
  Added a test flag to bionic run-test targets.
libc: Thread IDs missing from logcat -v thread

- stuff caller's thread id into the packet.

Bug: 13568206
Change-Id: If8b318ef75c7dcdddb05da8ac3038860f0fda5ec
Fix deadlock in timer_delete.

If the callback function for a timer did a timer_delete, the function
would never return. The problem was that the timer_delete function would try
to wait until the timer thread has finished. Waiting for yourself to finish
doesn't work very well.

Bug: 13397340
Change-Id: Ica123a5bafbc8660c8a4a909e5c2dead55ca429d
Remove ALIGNBYTES and ALIGN from <sys/param.h>

There are only three users of bionic definition of ALIGN and keeping it
in sys/param.h polutes the namespace.

I inline the definition in the the three places that's used.

Bug: 13400663
Change-Id: I565008e8426c38ffb07422f42cd8e547d53044e9
Merge "Fix deadlock in timer_delete."
am 998d7b03: Merge "Fix deadlock in timer_delete."

* commit '998d7b030763e8da6ff04020eedab552857587d2':
  Fix deadlock in timer_delete.
Merge "libc: Thread IDs missing from logcat -v thread"
am cce6c380: Merge "libc: Thread IDs missing from logcat -v thread"

* commit 'cce6c380d7c9574f823f5e038c28c793fdb55c58':
  libc: Thread IDs missing from logcat -v thread
resolved conflicts for merge of 081db840 to klp-dev-plus-aosp

Change-Id: I3696d19a42bfafe5ce137f3333751b85fb434a2a
Merge "FORTIFY_SOURCE: don't define s?printf macros if already defined"
am 95c1abec: Merge "FORTIFY_SOURCE: don\'t define s?printf macros if already defined"

* commit '95c1abecc02b2a2f40b507e669b5bc17d4412bf9':
  FORTIFY_SOURCE: don't define s?printf macros if already defined