Merge "Turn off cpp aidlgen, link libstatssocket as share"