Merge "Merge libstatspush_compat and libstatssocket_q"
am: a275bc4b6a

Change-Id: I40fa4a751b11849696729f84f0e510c0bdeb6006