Workaround for bug with latest NDK versions