Fix a routing bug for generic subcontrollers.

Change-Id: I3764da98f19f02c1f28a29377c6d24238d869930
Fixes-bug: 1361728
Resolve a bug that mixes up argument order for generic functions.

When context locals are disabled, the order of arguments passed explicitly to
generic controller handlers is incorrect (and causes the user to interact with
e.g., a Response object, when they're really getting a Request object).

Fixes-bug: 1374683
Change-Id: I5922b0a441f1ebae032d5b0d64c9ee0f4cf018e0
Merge "Resolve a bug that mixes up argument order for generic functions."
Merge "Fix a routing bug for generic subcontrollers."
Version increment.

Change-Id: I7edccb6171682585891d9898055fc6b7da54cfaa