Merge "ART: Fix core image detection"
am: b38b862273

Change-Id: If8fb5f7a3f2bf4eee5cbdf7194b6cb75ccd012bb