am a005445a: am ddde05f3: Merge "[MIPS64] Build debuggerd for mips64"

* commit 'a005445a7a0901675bbd04395a9eb699639aea9e':
  [MIPS64] Build debuggerd for mips64
Fix x86 and x86_64 builds.

Change-Id: I1ee9117843aff2abe4067f288b8496d4bfc78c9e
Merge "Fix x86 and x86_64 builds."
Merge "add definitions for sound trigger"
am a8a7f001: Merge "Fix x86 and x86_64 builds."

* commit 'a8a7f001f142a77a2c406455ace4a8c00e692111':
  Fix x86 and x86_64 builds.
am 2e389193: am a8a7f001: Merge "Fix x86 and x86_64 builds."

* commit '2e389193b01adb2d8f75e6c4038caaab4334b3ab':
  Fix x86 and x86_64 builds.
Fix build.

Change-Id: I7b0cf6a248c74f1a06e0b5d51a5be13124ced6a0
Merge "Fix build."
am d586e356: Merge "Fix build."

* commit 'd586e356526b77d3d64d4d247cd8f8e0871824d5':
  Fix build.
am 04511126: am d586e356: Merge "Fix build."

* commit '04511126a6e127705abce84735a3fe4eb48d882c':
  Fix build.
Fix libcutils/dlmalloc_stubs.c build breakage.

Change-Id: I344c410c100ce13c7a88063bf5354ad61c50094b
Merge "Fix libcutils/dlmalloc_stubs.c build breakage."
am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."

* commit 'b122da648dd1a7860776bc90b219ffa8c215faa6':
  Fix libcutils/dlmalloc_stubs.c build breakage.
am e7110ac0: am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."

* commit 'e7110ac09bdc77c4a8f7823aa666c9929a33984c':
  Fix libcutils/dlmalloc_stubs.c build breakage.
Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"

* commit '7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60':
  Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
am 4e3f28e7: am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"

* commit '4e3f28e748e0fe6e71d34a898c6a670621786200':
  Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
DO NOT MERGE: Revert "delete libnl_2"

This reverts commit 7097f052d946bc9fbe298c7a88e1d943f54f684e.

libnl_2 needs to stay in AOSP for now for compatibility with
GPL test builds.
am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete libnl_2"

* commit '6e3fffeca6ac00379b0a22888d04a58ee0f51057':
  DO NOT MERGE: Revert "delete libnl_2"
am 9924bfba: (-s ours) am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete libnl_2"

* commit '9924bfba6972861b0d0429717e02a27501a4e983':
  DO NOT MERGE: Revert "delete libnl_2"