Merge "Reconfigure stub libraries to do less work." into rvc-dev