Merge "Merge libstatspush_compat and libstatssocket_q" am: a275bc4b6a am: 3ef6f2e806

Change-Id: I46ce4fb9bbdbab48c6147e7867eb0dfe9cfc1e58