Revert "Minor build-time patching usability improvements."

This reverts commit 209f1e5a.

Change-Id: Iaacf5bd408a08329749d002f4325f9e621ee1b4d

vendorsetup.sh

@@ -54,10 +54,10 @@ __tree_md5sum()
 
 __abandon_tree()
 {
+   rm -f out/lastpatch.md5sum
    if [[ -d .repo ]]; then
       ${REPO} abandon b2g_autogen_ephemeral_branch || true
    fi
-   rm -f .lastpatch.md5sum
 }
 
 
@@ -72,16 +72,14 @@ __patch_tree()
       echo -n ">> Analyzing workspace for change..."
       local LASTMD5SUM=invalid
       local MD5SUM=unknown
-      if [[ -f .lastpatch.md5sum ]]; then
-         LASTMD5SUM=$(cat .lastpatch.md5sum)
+      if [[ -f out/lastpatch.md5sum ]]; then
+         LASTMD5SUM=$(cat out/lastpatch.md5sum)
          MD5SUM=$(__tree_md5sum ${B2G_PATCH_DIRS})
       fi
       if [[ "$LASTMD5SUM" != "$MD5SUM" ]]; then
-         echo "Change detected.  Applying B2G patches."
+         echo "Change detected.  Applying B2G patches".
 
-         if [[ -f .lastpatch.md5sum ]]; then
-            __abandon_tree
-         fi
+         __abandon_tree
 
          branch() {
             [[ -d $1 ]] || return 1
@@ -219,7 +217,7 @@ __patch_tree()
          echo
          echo B2G patches applied.
          mkdir -p out
-         echo $(__tree_md5sum ${B2G_PATCH_DIRS}) > .lastpatch.md5sum
+         echo $(__tree_md5sum ${B2G_PATCH_DIRS}) > out/lastpatch.md5sum
       else
          echo no changes detected.
       fi