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

Change-Id: I9a044da7c4b61ba8e207241c3e3867185ce204b8