Fix typo in comparison function of RouteFlowKey.
Also fix couple of gdb macros to reflect updated code.

Change-Id: I030751c61f4fca94fff86348d29b9cae6501a9f7