Merge "Merge "Make libstatssocket shared" into rvc-dev am: 36a845de am: e09c6ba6 am: 8f74209c" into rvc-qpr-dev-plus-aosp