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

Change-Id: I18aadc35d805d4cee0e0ef8a3c60c44750555417