android_ndk_version and revision can be grouped together

var/android_ndk_version and var/android_ndk_revision are always used together.

For automating the toolchain updates, it'd be useful to stop splitting them.