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