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