Merge "Make ext build against core.platform.api.stubs"