Instead of having custom helpers (like NELEMENTS) for evaluating the
array size avoid the code duplication by using the now available
ARRAY_SIZE macro.
Change-Id: I40e2e55bd4a68e3d24854c12086432aa17ce1abe
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>