Merge "Ensure compare_images is built with one TARGET_PRODUCT." am: 41dca08dfc

Change-Id: I4b483de16f9fb15a0a8c782094ba378ce24d1782