added macro FIX_2485_HARMONIZE_perform_noise_estimation_enc and harmoninzed...

added macro FIX_2485_HARMONIZE_perform_noise_estimation_enc and harmoninzed perform_noise_estimation_enc*_fx()