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

Change-Id: I35386cb43b6f551485a27823dfddc5b002db32fc