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

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