Merge changes I8f3fb7ae,I74eb7cb0

* changes:
  header-abi-dumper: Add omp.h workaround
  header-abi-dumper: Refactor argv fixes