Delete MediaStore.java.orig