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

Change-Id: I2bc9a3e9418fe2111ed04ca301246adbc73e10f9