Merge "Revert "Annotate rild with socket_between_core_and_vendor_violators"" into oc-dev am: 0e0ed156 am: ed27bec5 am: 9f5801de Change-Id: I5861f5464762ddea8c6a39cb3968d73017d9767d