Merge changes Idaa6699d,Ic7759ef9
am: faf7946bd7

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