Auto generated Android template is limited to one architecture

When creating the default Android templates then this is added to the .pro file:

contains(ANDROID_TARGET_ARCH,arm64-v8a) {
    ANDROID_PACKAGE_SOURCE_DIR = \
        $$PWD/android
}

Wouldn't it be better to add it architecture independent (because the code in the "ANDROID_PACKAGE_SOURCE_DIR" is usually independent from the architecture):

android: {
    ANDROID_PACKAGE_SOURCE_DIR = \
        $$PWD/android
}