Merge "ART: Fix the debug-build inclusion"