[automerger skipped] Merge "Reconfigure stub libraries to do less work." into...
[automerger skipped] Merge "Reconfigure stub libraries to do less work." into rvc-dev am: 48b68ffe -s ours
am skip reason: Change-Id Ie3a7e078844d1d1cac7976142e2069704d4c1545 with SHA-1 94bac9cc is in history
Change-Id: If6bfd1d00c424c92dfefa526e0af1cded58d36d9