Merge "Revert "Import broadcast_ring.h from GVR"" into oc-dev
am: 5bf90e1d47

Change-Id: I57c43fbeb716cb788bc098a2ff1a58aba426c773