Merge "Revert "Annotate rild with socket_between_core_and_vendor_violators"" into oc-dev am: 0e0ed156 am: 65ffb065 am: bc6271bc Change-Id: I2915ce7ffa3f11d07c26a32b2d9b2d463a3c21f4