am cff942b1: Merge "Add adb root to test-art-target, required by adb remount."

* commit 'cff942b1f7ebb82e3d5e0a1334467544eced1575':
  Add adb root to test-art-target, required by adb remount.