Merge commit '686fddb069e0031d92453703979acd7d699cf761' * commit '686fddb069e0031d92453703979acd7d699cf761': Allow override of default symbol location for native heap library resolution
Merge commit '686fddb069e0031d92453703979acd7d699cf761' * commit '686fddb069e0031d92453703979acd7d699cf761': Allow override of default symbol location for native heap library resolution