am c26d33b2: am 51e8e98b: am 11307fd2: Merge "Make tests assume ANDROID_ROOT is not /system."

* commit 'c26d33b208f264570e9dfa41f10b1065517f5eed':
  Make tests assume ANDROID_ROOT is not /system.