Merge "Remove the rename() interceptor"

import java.lang.ref.WeakReference;

import java.lang.reflect.Method;

import java.net.InetAddress;

import java.nio.file.Files;

import java.text.DateFormat;

import java.util.ArrayList;

import java.util.Arrays;

                super.remove(path);

            }

        }

        @Override

        public void rename(String oldPath, String newPath) throws ErrnoException {

            try {

                super.rename(oldPath, newPath);

            } catch (ErrnoException e) {

                if (e.errno == OsConstants.EXDEV) {

                    Log.v(TAG, "Recovering failed rename " + oldPath + " to " + newPath);

                    try {

                        Files.move(new File(oldPath).toPath(), new File(newPath).toPath());

                    } catch (IOException e2) {

                        throw e;

                    }

                } else {

                    throw e;

                }

            }

        }

    }

    public static void main(String[] args) {