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

Change-Id: I693064887b2aa970a240b688e811786e22c10431