Re-enable boot HAL tests and make sure they restore previous slot flags. am: d028b91f4a

Change-Id: I1e5c42c592419c097e678bd966b3ee3b26efd3c9