Merge "Add test config to statsd_test and apply mainline module" into rvc-dev am: 3079748d am: e2237b9f Change-Id: I2e859ca98199b9dea120b9e7e4882a4a87190ba2