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

Change-Id: Ifde9f51dc3e1c6eb43d1552cccb6715585d9a9c5