Merge "Enable statsd module MTS tests to be included in android-mts-statsd as well as android-mts."