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