Merge "Remove obsolete TARGET_AUX_OS_VARIANT_LIST"