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