Merge from jb-mr1-dev-plus-aosp

Change-Id: I6ffd5eb159dbec6bb8819689c28dcf2b0778ff38
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index daac5b0..79d5055 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
 fi
 shift
 
-DEVICES="maguro toro toroplus grouper manta tungsten"
+DEVICES="maguro toro toroplus grouper tilapia manta phantasm"
 export LC_ALL=C
 
 repo sync -j32 -n