Merge "Revert "Use std::min() and std::max()""

native/jni/src/defines.h

...ve/jni/src/suggest/core/dicnode/dic_node_priority_queue.h

native/jni/src/suggest/core/dicnode/dic_node_utils.cpp

native/jni/src/suggest/core/dicnode/dic_nodes_cache.h

...src/suggest/core/dicnode/internal/dic_node_state_output.h

...c/suggest/core/dicnode/internal/dic_node_state_prevword.h

...rc/suggest/core/dicnode/internal/dic_node_state_scoring.h

native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp

native/jni/src/suggest/core/layout/proximity_info.cpp

native/jni/src/suggest/core/layout/proximity_info_state.cpp

...ni/src/suggest/core/layout/proximity_info_state_utils.cpp

...src/suggest/core/layout/touch_position_correction_utils.h

.../jni/src/suggest/core/result/suggestions_output_utils.cpp

...rc/suggest/policyimpl/dictionary/header/header_policy.cpp

...st/policyimpl/dictionary/utils/forgetting_curve_utils.cpp

native/jni/src/suggest/policyimpl/utils/edit_distance.h

native/jni/src/utils/autocorrection_threshold_utils.cpp