Merge "Revert "hammerhead: Add support for modem logging" [DO NOT MERGE]" into klp-dev