Merge "hal: compilation fix for extended feature flags"