Merge changes Idaa6699d,Ic7759ef9 am: faf7946bd7
am: 7c72c0f28d

* commit '7c72c0f28d55d528162ad8ad652a311a41d1f3be':
  logd: sock_alloc_send_pskb starves pruning
  logd: Allow (some) headers to be individually importable