use OrderedDict instead of builtin dict for params

to preserve their order
in both extract_templates_and_params()
and extract_templates_and_params_regex()

Bug: 55882
Change-Id: I923e8b188f5212eaa531337617472f4601a43652
Original-Change-Id: I4253824897f3fe4849ad09ed7e7931cf97e6e4a3
Merge "use OrderedDict instead of builtin dict for params"