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

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