Merge changes Id0fe51d0,Ie3b3907b

* changes:
  Support building diagnose_usb against musl
  Support building fs_mgr against musl