Merge "Also consider secondary storage when verifying paths" into lmp-dev

        try {

            File f = new File(path);

            String canonical = f.getCanonicalPath();

            if (canonical.startsWith(mMediaStoragePath)) {

            for (String root: mStorageMap.keySet()) {

                if (canonical.startsWith(root)) {

                    return true;

                }

            }

        } catch (IOException e) {

            // ignore

        }