Merge changes from topic "imx8mq_build_fix" into integration

* changes:
  fix(imx8m): fix imx8mq build break
  fix(imx8mq): fix imx8mq build break due to hab