Merge "Generate merged public and system stubs"