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

Change-Id: I92bea06bab1ba2ef1084ae73949a569fbc29bc4e