Updated Measurement of the Average B-hadron Lifetime