Merge "Use REPLACE_EXISTING for rename(2) workaround." into rvc-dev am: 78243297 am: 88214048

import java.net.InetAddress;

import java.nio.file.Files;

import java.nio.file.Path;

import java.nio.file.StandardCopyOption;

import java.text.DateFormat;

import java.util.ArrayList;

import java.util.Arrays;

                if (e.errno == OsConstants.EXDEV && oldPath.startsWith("/storage/")) {

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

                    try {

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

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

                                StandardCopyOption.REPLACE_EXISTING);

                    } catch (IOException e2) {

                        Log.e(TAG, "Rename recovery failed ", e);

                        throw e;

                    }

                } else {