Merge "Build statsd framework jar against module_current"