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

Change-Id: I4c876d96fbbab6f891601fc3c147fc02c031bb6d