Merge "system and product image diff tool" am: e65b3cc324 am: 9bc50603fe
am: 29befa9dcf

Change-Id: Ie7ac0b37ab21e82d944b0e0e06ed161572ca1562