Merge "Fix test checking /system in chroot in clean-up script."