Merge "Create libstatssocket_q"
am: 0ba7842577

Change-Id: Ibb745108290c67e97c2e766d7534bcc4de28c49d