Solvent Gas Uptake of CO2 and Propane in Heavy Oil for Enhanced Oil Recovery