Merge "build_mixed script has '-s' option for product.img"
am: 4619c3295c

Change-Id: I12142c275aa3d1c3df527162e860912bf506ce8b