Updated NDK and little Java changes