Merge "Use deliberately public API rather than org.apache cruft."

import android.os.FileUtils;

import android.os.Process;

import org.apache.harmony.luni.util.InputStreamHelper;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileOutputStream;

import javax.crypto.KeyGenerator;

import javax.crypto.SecretKey;

import libcore.io.IoUtils;

/**

 *@hide

 */

    public byte[] retrieveKey(String keyName) throws IOException {

        File keyFile = getKeyFile(keyName);

        if (!keyFile.exists()) {

            return null;

        }

        FileInputStream fis = new FileInputStream(keyFile);

        return InputStreamHelper.readFullyAndClose(fis);

        return IoUtils.readFileAsByteArray(keyFile.toString());

    }

    public void deleteKey(String keyName) {