Merge "Create libstatssocket_q" am: 0ba7842577 am: 7da018252b

Change-Id: I4aaeaa0c9d2c9cf49e5324ca96452820356c6751