Merge "Remove static dep on ike-stubs" into rvc-dev am: cc4eccc7c6 am: e80b212f51 am: 62678aecb6 am: cdefe82374 am: d1924a7298

Change-Id: I67a67e7bc470d4610087a69bcf605f160c507902