Revert "Securely encrypt the master key"

This reverts commit 4bf1887c787a025aad2fbafe382e556e85ac73b0.

Change-Id: Ie6d1f39de530b99b50a27ddc45bcc900a24e04b5
3 files changed