Fix UNITS_<VAR> def and <var> use mismatch

[ts826848]

A few variables prefixed with UNITS_ are defined to control various build options, but prefix-less versions are checked in the rest of the file when determining their values. This makes the options effectively useless.

This commit unifies definition and use so the options actually affect the build.