Merge "Revert "Annotate rild with socket_between_core_and_vendor_violators"" into oc-dev