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

Change-Id: I7450fe00df591155dc84e405d13e887e5c03f651