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

Change-Id: Ie2b79f523c0bf150083124b89b2969b01c7c34ff