am 0ef4d5ed: am 453f0bd6: am 67a27572: am af7cdee2: (-s ours) Fix bug with preexisting droidreamclean file

* commit '0ef4d5ede30ef4ffa1faf0eb88a95354d4d214ea':