merge libnih part of the x-compile change
3 files changed