Merge "Have testrunner honor ART_TEST_CHROOT only for target tests." am: 0b7e6c96ea
am: 36d97c5474

Change-Id: Ic37024feff2cf669c8512ae9800f10d75a8a63c4