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

Change-Id: I9f41e5658ecf69f3c5f71a25c59a409f39e82405