Merge "ART: Build fix for dex_cache rework"