Merge "Reconfigure stub libraries to do less work." am: 7488b79ea0 am: 78e96933f3

Change-Id: I02c41d6346a405badbafaed78b551ab75fa4c117