Merge "Move StatsLog.java to fw-statsd.jar"