Merge "Synchronize the NetworkStatsFactory constructor."

        mStatsXtIfaceFmt = new File(procRoot, "net/xt_qtaguid/iface_stat_fmt");

        mStatsXtUid = new File(procRoot, "net/xt_qtaguid/stats");

        mUseBpfStats = useBpfStats;

        synchronized (sPersistentDataLock) {

            mPersistSnapshot = new NetworkStats(SystemClock.elapsedRealtime(), -1);

            mTunAnd464xlatAdjustedStats = new NetworkStats(SystemClock.elapsedRealtime(), -1);

        }

    }

    public NetworkStats readBpfNetworkStatsDev() throws IOException {

        final NetworkStats stats = new NetworkStats(SystemClock.elapsedRealtime(), 6);