am 14f98d5a: Merge from AOSP staging branch

* commit '14f98d5acdb00aea40550e80bc20a76e20257c3f':
  Generate fixed JOP40C factory images
  JOP40D factory images for Manta
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index d0b8ac2..3b94dbf 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -20,6 +20,7 @@
 # 526897 = JOP39B
 # 527221 = JOP40
 # 527662 = JOP40C
+# 533553 = JOP40D
 # end jb-mr1-dev
 
 source ../../../common/clear-factory-images-variables.sh
@@ -27,6 +28,7 @@
 DEVICE=manta
 PRODUCT=mantaray
 VERSION=jop40c
-SRCPREFIX=signed-
+SRCPREFIX=FIX-signed-
 BOOTLOADER=mantalj12
+ERASEALL=true
 source ../../../common/generate-factory-images-common.sh