Merge "build_mixed script has '-s' option for product.img"