Merge "ART: Fix data loss when symbolizing oat files." into mnc-dev