Merge "ART: Fix up libartagent deps"
am: 911ae191d3

Change-Id: Ib2e71b738e15615dccec872638d3c406af2dd611