Merge "Check that /system exists in chroot before cleaning it up."
am: 223b8dc552

Change-Id: I4acbd7f41f168f9c087dfe565c38b6d595b54d2e