[automerger skipped] Merge "Do not statically link ike-stubs" into rvc-dev am: 969da7c894 am: ba32fd4e09 am: 19be99cbc4 -s ours am: 272d32904e -s ours
am skip reason: Change-Id I503616de0143cc39dd189ae689de3e8d77c345da with SHA-1 5fc0bbaae7 is in history
Change-Id: I98034c7548af1a2ed6b14917233bd13acef41ba0
This commit is contained in: