Delete MediaStore.java.rej