am b9dc0359: am cd3479df: am fd06f392: Merge "ART: Fix libjavacore dependency"

* commit 'b9dc0359dd9e50b4a44964382d87d773f79dbc81':
  ART: Fix libjavacore dependency