Merge changes I10561d93,I05d248a7

* changes:
  Perfprofd: Add TEST_MAPPING
  Perfprofd: Disable tests when lacking arch_perfmon