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

Change-Id: Ia394e2577b2420aec493f1ced657de339ebdb538