am b96fd84b: Merge "Another ART_TEST_ANDROID_ROOT fix."

* commit 'b96fd84b8806c9670f04329cd531e97016c3eaa6':
  Another ART_TEST_ANDROID_ROOT fix.