Merge "Work-around for bionic sigsetjmp bug"