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

* commit 'cd3479dfe69d79206953c764162fd63647320b62':
  ART: Fix libjavacore dependency