Merge "Refactor to IpNeighborMonitor and single-threaded semantics" am: b501e7e25b am: c4ca15786f
am: 91bb7b17d2

Change-Id: I128763174d70cc4b5999f3fcda485604c006a24e