Merge "Use android_root instead of hard coded /system in test script."