Merge "Adding product.img for `fastboot flashall`"
am: c41ff1b366

Change-Id: I8beb7ba3b313112e7ae84d74a894b76f670b811b