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

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