Merge changes I036fbc5f,I979f0107 into nyc-dev
am: 60b688876d

* commit '60b688876de79392236524b950381927878fa34f':
  If we can't call into an app process to deliver an intent, crash the process.
  If a crash dialog can't be shown, just kill the process.

Change-Id: Ie82f693507a546a560cf622d6830e50a9041543d