am eccbc7c9: Merge "Fix NativeCrashListener"

* commit 'eccbc7c96f3f3dfa82f25362cf4ed0db3d9a6cb6':
  Fix NativeCrashListener