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

Change-Id: Ie73cea0ee9619f60b682dc34d1102a5aa2c20b69