Merge "Revert "Revert "Generate stable version of NetworkStackStatsLog"""