am d92c5c03: am 6c5f4cd0: Merge "Fix hang/crash in native path code" into jb-dev

* commit 'd92c5c03d0fafe6f4c5f689eabd5024a4bbf262d':
  Fix hang/crash in native path code