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

Change-Id: I5ae4acc8377c87c4a581929f81899a1693f602d7