Merge "Fix test checking /system in chroot in clean-up script."
am: 6cee0e9662

Change-Id: Id5697d7f4f27c7e6823a1a0d3c61eea14a9f2fe1