[automerger skipped] Merge "Do not statically link ike-stubs" into rvc-dev am: 969da7c894 -s ours am: 7cfca2480a -s ours am: b1380aac70 -s ours
am skip reason: Change-Id I503616de0143cc39dd189ae689de3e8d77c345da with SHA-1 d713db92a5 is in history
Change-Id: Ibf37eb50c6bd2921e133ed157363af3649abc144
This commit is contained in: