Merge "Ensure dropbox could copy tombstone files to special folder."

        // Start watching for new tombstone files; will record them as they occur.

        // This gets registered with the singleton file observer thread.

        sTombstoneObserver = new FileObserver(TOMBSTONE_DIR.getPath(), FileObserver.CLOSE_WRITE) {

        sTombstoneObserver = new FileObserver(TOMBSTONE_DIR.getPath(), FileObserver.CREATE) {

            @Override

            public void onEvent(int event, String path) {

                HashMap<String, Long> timestamps = readTimestamps();

                try {

                    File file = new File(TOMBSTONE_DIR, path);

                    if (file.isFile()) {

                    if (file.isFile() && file.getName().startsWith("tombstone_")) {

                        addFileToDropBox(db, timestamps, headers, file.getPath(), LOG_SIZE,

                                TAG_TOMBSTONE);

                    }