Merge "Ensure compare_images is built with one TARGET_PRODUCT." am: 41dca08dfc am: 549d754f67 am: 606beedeb9

Change-Id: I9018a09ca70f0e8386afe4c04b3b1b5cae8abcb8