[automerger skipped] Merge "Merge libstatspush_compat and libstatssocket_q" am: a275bc4b6a am: 3ef6f2e806 am: 74408bcec4 -s ours
am skip reason: Change-Id I6a49b4995b56df462e1be901ea5e54acfe2e8bac with SHA-1 7070b7ac74 is in history

Change-Id: I97345ac77e7f31969d08148a562a644c27270e08