resolved conflicts for merge of 4d75d98f to master

Change-Id: I4fbf8e8a5fd8a41e8e4ebbfebc68b0fb64e180e5
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index 93b4189..630beea 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
 fi
 shift
 
-DEVICES="maguro toro toroplus grouper manta"
+DEVICES="maguro toro toroplus grouper manta mako"
 export LC_ALL=C
 
 repo sync -j32 -n
@@ -66,10 +66,7 @@
       cut -b 15- |
       sort -f > $ARCHIVEDIR/$DEVICENAME-with.txt
   done
-  rm -rf device/lge
   rm -rf hardware/broadcom/nfc
-  rm -rf hardware/msm7k
-  rm -rf hardware/qcom
   rm -rf vendor
   for DEVICENAME in $DEVICES
   do