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

Change-Id: I0615a8fa411250ecf81490d9bbfa4b793d646495