Merge changes from topic "logwrapper-api-update"

* changes:
  Update system/extras for logwrapper
  puncture_fs: convert to C++ and update for logwrapper