ICU-6866 merge r25980 and r25981 (spoof detector - malloc/delete problem fix and module configuration fix) X-SVN-Rev: 25982