am f35165a9: Merge "Work-around for bionic sigsetjmp bug" * commit 'f35165a9fe623290659a755598925a833b284e22': Work-around for bionic sigsetjmp bug