Merge "Fix stub library definition."