[automerger skipped] Merge "Reconfigure stub libraries to do less work." into rvc-dev am: 48b68ffe6e -s ours am: f2d59429e6 -s ours
am skip reason: Change-Id Ie3a7e078844d1d1cac7976142e2069704d4c1545 with SHA-1 6bb95ad751 is in history
Change-Id: I03dfe7141c7214a7698928cc732fcb1eb1723894
This commit is contained in: