Merge "Remove uses of libcore.io DropBox and EventLogger"