Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev am: d83682eab3

Change-Id: I2a9c75a6e6931e955408ced2456f954e94825754