Revert "Fixing the race condition in GenerateRkpKey"

This reverts commit d05498b9d8d30ca69eaafe920c5915ee472058eb.

Reason for revert: Bugged on non-RKP systems.

Bug: 190222116
Change-Id: Ie7d17d4251c381c1bae6a76cd9b0246c551f8042
2 files changed