am adec2de2: am 6195eb13: Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb

* commit 'adec2de2e35f3dab186d1abbbeb7497921a35c2c':
  Prevent Dropbox from crashing system server pre-boot.