Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ibe87f908fb7665825284926900227a6f6428e153
Modify Makefile for building for ASAN

Change-Id: I18fe150f994d9217d0526660b1cac781fdac92cb
Convert exit calls to abort for Android

Bug: 6603427

This is to track some silent failures happening in mediaserver.

Change-Id: I9345cee5e0137b723fd5a2b7c787c235af4462b8
am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for Android

* commit '86e0fcf830dcbada802ea2de22904e912dda5384':
  DO NOT MERGE Convert exit calls to abort for Android
am c2c49272: (-s ours) am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for Android

* commit 'c2c49272a8d186f5abd688836f1deaaf06865f9d':
  DO NOT MERGE Convert exit calls to abort for Android
Reconcile with jb-release

Change-Id: I39749f27bd2911551a009fed4a3ed045a5e6eb12
am 99912695: Reconcile with jb-release

* commit '99912695a49365b7caa3586656e8fa68eb0bcd33':
Work around for use-after-free cert bug

Holds a strong references in the cert cache.
This is a simpler alternative to full backport of upstream fix,
from http://crrev.com/92977 -- see bug for more details.

BUG: 6508448

Change-Id: Ib47ca2e33b9e43ac47baf645069ecaab257ec74a
Merge "Work around for use-after-free cert bug"
am 0fcb69e6: Merge "DO NOT MERGE Work around for use-after-free cert bug" into jb-dev

* commit '0fcb69e6703c52ab000dee698d4c07d19eeefee9':
  DO NOT MERGE Work around for use-after-free cert bug
am ea30d010: (-s ours) am 0fcb69e6: Merge "DO NOT MERGE Work around for use-after-free cert bug" into jb-dev

* commit 'ea30d01040ba3e7119f24f8a15632c929b93e6d5':
  DO NOT MERGE Work around for use-after-free cert bug
Reconcile with jb-release

Change-Id: Ib0777e5e7794dec80266a4c25946b267d316f527
am 2f413d82: Reconcile with jb-release

* commit '2f413d82e2541002b7f9507ad66d341d130f80e1':
Forward-compatible fix for ucontext_t

The Android C library <signal.h> will soon be modified to declare
ucontext_t in <signal.h>. To avoid conflicts when this happens, only
define the type when needed.

See b/issue?id=2189142

Change-Id: I297b8e6f9fba8fb99c5f799b0d7e7f4dbda914bb
Merge "Forward-compatible fix for ucontext_t"
am 0abec4da: Merge "Forward-compatible fix for ucontext_t"

* commit '0abec4daa38319f371ac6555e7887f6b14f34291':
  Forward-compatible fix for ucontext_t
Add MIPS architecture support

Change-Id: Id2c3f41edee0e1c73cb084666533802bcf117876
Signed-off-by: Douglas Leung <douglas@mips.com>
Signed-off-by: Chris Dearman <chris@mips.com>
Fix lazy-instance template to preserve object alignment on MIPS.

The alignment attribute of an object was discarded when allocating storage
for the lazy-instance. Alignment is important for MIPS, where doubles
(and objects containing them) must be aligned on 8-byte boundary.

The alignment attributes are included via a macro that is only defined
under GCC, so that this change does not affect other build enviromments.

Change-Id: I99047cf610618de2e7e29e5de85835dc45d99231
Signed-off-by: Paul Lind <plind@mips.com>
Merge "Add MIPS architecture support"
Merge "Fix lazy-instance template to preserve object alignment on MIPS."