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

Change-Id: I345fe212d021864803b1f12447af1a8ded299826