relocate android.util.base64.* -> android.util.*

b/2553469 - API REVIEW: android.util.base64

Change-Id: I5394427a8e2c94b87ca45a533e417f7088a69f8f
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index c677a4c..0d6695f 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -86,7 +86,7 @@
 import android.provider.Calendar.Events;
 import android.util.Log;
 import android.util.Xml;
-import android.util.base64.Base64;
+import android.util.Base64;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/com/android/exchange/adapter/ContactsSyncAdapter.java b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
index 2fe5d7e..ed45265 100644
--- a/src/com/android/exchange/adapter/ContactsSyncAdapter.java
+++ b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
@@ -59,7 +59,7 @@
 import android.text.util.Rfc822Token;
 import android.text.util.Rfc822Tokenizer;
 import android.util.Log;
-import android.util.base64.Base64;
+import android.util.Base64;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java
index e7caf86..5cade38 100644
--- a/src/com/android/exchange/adapter/EmailSyncAdapter.java
+++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java
@@ -45,7 +45,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;
-import android.util.base64.Base64;
+import android.util.Base64;
 import android.webkit.MimeTypeMap;
 
 import java.io.IOException;
diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java
index 297642b..4981622 100644
--- a/src/com/android/exchange/utility/CalendarUtilities.java
+++ b/src/com/android/exchange/utility/CalendarUtilities.java
@@ -45,7 +45,7 @@
 import android.provider.Calendar.EventsEntity;
 import android.text.format.Time;
 import android.util.Log;
-import android.util.base64.Base64;
+import android.util.Base64;
 
 import java.io.IOException;
 import java.text.DateFormat;