Merge "Merge "Remove static dep on ike-stubs" into rvc-dev am: cc4eccc7c6 am: e39856f994" into rvc-d1-dev-plus-aosp am: 97cb002206

Change-Id: Id72d603a4a9c988f6bfeac19adece23c7c9b1368