Merge "update_engine: Allow to tag sockets." am: 8d48aa7988 am: 255e0ed383
am: e8fdd80562

Change-Id: I1acef5124c5188f947f6e974908223fd13c0103e