Update to work with the latest Android NDK