Merge branch '1628-mediapicker' into feature/modularize-editor

Author: maxme

WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java

@@ -11,8 +11,6 @@
 import android.webkit.MimeTypeMap;
 
 import org.wordpress.android.util.AppLog.T;
-import org.wordpress.android.util.helpers.MediaFile;
-import org.wordpress.android.util.helpers.WPImageSpan;
 
 import java.io.DataInputStream;
 import java.io.File;