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

Change-Id: Ic14ae736b0c0f745d7cec0ee178cc3daa7b23596