Merge "Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage""