Added NDK support