Generated code compiles with the new build scheme, works, etc. Change-Id: I147aa5fa580a71ef25615b02277870867e475042 Signed-off-by: Dave Barach <dave@barachs.net>