Move stuff around to allow keymaster to start in time

Change-Id: I5161ce11e89e81060e3380f820af3b1c0092c5d2
5 files changed