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

Change-Id: Ic2bcf55d3c579d79fa8b91dd18337a30ead8ab56