Merge "[automerger skipped] Merge "Remove uses of libcore.io DropBox and EventLogger" am: 1c3592a865 am: 14c0c4185c am: 6e5de81b95  -s ours"