Merge "ART: minor fix for no-opt debug builds"