Merge "Use stubs generated by build system"