Merge "[automerger skipped] Merge "Remove uses of libcore.io DropBox and EventLogger" am: 1c3592a8 am: 14c0c418 am: 6e5de81b -s ours"