Encrypt AES-256 keystore master keys.
am: b951bc5317

Change-Id: I57600ce91f6fc7004c9d344ad5976d0952b19d69