Merge "Add test config to statsd_test and apply mainline module" into rvc-dev...
Merge "Add test config to statsd_test and apply mainline module" into rvc-dev am: 3079748d am: 62ad905e am: bc891d93
Change-Id: I508faec23125522cd51ce7a1677b78b1e56a1685