Merge "Remove uses of libcore.io DropBox and EventLogger"
am: 1c3592a865

Change-Id: Ia0899f71a2207bd9b498883222588cc245c697da