[all] Add support for %{device_variant} for AOSP
[nuc] Use the device/device_variant pairing