Revert^2 "Split rkp from keymint."

ccbb5d8a61401567605e4bc297a7a2b46d90bb22

Change-Id: I3734bd7647cbb7b33ef654ba2fb40fe8a648689e
25 files changed