Integrate VPN with new keystore and misc fixes.

* Changes
  + Pass intent to keystore when needed and hooks to resume from it.
  + Generate random, unique ID for profile instead of base64 from its
    name.
  + Add VPN to "Wirless controls" description.
  + Add credential storage to "Security & location" description.
  + More hints to set password and unlock dialogs in credential storage
    settings for actions that come from other processes.
  + Sort VPN profiles according to the names.
  + Replace Keystore with CertTool in L2tpIpsecEditor

src/com/android/settings/vpn/Util.java

@@ -23,8 +23,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.widget.Toast;
 
-import org.apache.commons.codec.binary.Base64;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -59,10 +57,6 @@ class Util {
         createErrorDialog(c, message, listener).show();
     }
 
-    static String base64Encode(byte[] bytes) {
-        return new String(Base64.encodeBase64(bytes));
-    }
-
     static void deleteFile(String path) {
         deleteFile(new File(path));
     }