Sync with hybris/utils (810ae2) [utils] Extract headers for log

Signed-off-by: David Greaves <david@dgreaves.com>
Fix macro handling without_mer_verify_kernel_config