Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev am: d83682ea am: 177941f8 am: 1bc7758b Change-Id: I844c0f31977db215a83fbf357e0ebfdf8e7852a8