Merge "Fix stub library definition."
am: 92da7cfab7

Change-Id: If2f1daf3b13795de8d2163397427fbf4dd3db9a8