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

Change-Id: I2197a377e60da5064ca9f93536c86218c9d0ab4d