Extract typedefs to local variable to avoid error in xtend generated class.

Change-Id: If58153836a3e619be51f5eeedce44e9f92076f47
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Merge "Extract typedefs to local variable to avoid error in xtend generated class."