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

Change-Id: I36c33bb8d7ad90cb486d63247344c28e632cc27a