Merge changes I0940d13e,I38f2d013

* changes:
  Add TEST_MAPPING for libnativeloader
  Test the link to the sphal namespace when only needed