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