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