[automerger skipped] Merge "Reland "Prevent statically linking to a lib...
[automerger skipped] Merge "Reland "Prevent statically linking to a lib providing stable C APIs"" am: 5a33a3ca am: 78a44881 -s ours
am skip reason: Change-Id I05f0465976098941d47ecc06c978cfa116364d78 with SHA-1 af7ed39b is in history
Change-Id: I403b1960864007bb997a0da1eae63f2debeda6df