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

Change-Id: I16ed2bd7f17b48788c57570bdf513dddc1463eab