Merge "Upgrade parking_lot_core to 0.9.5"