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

Change-Id: Id1957b208706e7caf68b15e0c9a1c218b77f79ab