Merge "Add libstatssocket_test to TEST_MAPPING"