Merge "Use renamed AStatsSocket_close()"