Further work on NDK building;