Merge "ART: Fix libjavacore dependency"