[automerger skipped] Merge "Adding product.img for `fastboot flashall`" into pi-dev am: 88993acd95  -s ours
am: 493e6ec922  -s ours

Change-Id: I8c491f70705c662d40d0b212bcbc43a0de279bec