Revert "Securely encrypt the master key"

This reverts commit af2359fdc4a45fcf482d1a316bae1fff226c425b.

Change-Id: Icd4d04adf5c0728357caa6eb225b9a08fd0ad552
10 files changed