Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true."