Merge "dumpstate: add dropbox crashes to bugreport" into oc-dev am: 77e270d0ff
am: 000017be4c

Change-Id: I99b7cc93796efb0ab1d56585d9f266b37cb077be