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

Change-Id: I4af9dc04372c7f4dfb10e5ac15dbf4c4f6c9067a