Add arguments for returning the descriptor version and also
the memory map key.  The key is required for calling
exit_boot_services().
Signed-off-by: NRoy Franz <roy.franz@linaro.org>
Signed-off-by: NMatt Fleming <matt.fleming@intel.com>