Merge "Add services-stubs for in-process APIs in services.jar"