Revert^2 "Refactor IC support for RKP"

201e6abbd0999ea4afb7e9ef825fc12af359f999

Change-Id: I52171d7d5253b415cdcdfcf09061629e9a20ee1a
2 files changed