Merge "ART: Add arch-specific directories to host-oat-cleaning rule"