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

Change-Id: Ib908b6ce9a2c094e95264d02a0e38d4f74032ee4