[automerger skipped] Merge changes from topic "no_staticlinking_to_stubs" am:...
[automerger skipped] Merge changes from topic "no_staticlinking_to_stubs" am: 1bd72c83 am: 8b64bcf3 -s ours
am skip reason: Change-Id Ibfa25c0fe7874ba08157a5ec43601c5cf8305723 with SHA-1 21f7e6a3 is in history
Change-Id: Iba823febc120471df08f7a47376f1dad82de5137