Merge "Reconfigure stub libraries to do less work." into rvc-dev am: 48b68ffe am: c8d040c9 am: 00187166 Change-Id: I1a9d40f5dea2860e79909a494bd68abba8201ae8