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

Change-Id: Ib5af4384d358571b63c4228117c73dd3693e414a