Merge "ART: Fix test dependencies"
am: 8f5d7a6121

Change-Id: Ibbf2d260c5fe9066c47dde5d78381d509473e38e