am 964e1961: am 93e16dca: Merge "libcutils: fs_config: winsdk_tools build fix"

* commit '964e19616b76112c853d2b59d5769edc9a4b9602':
  libcutils: fs_config: winsdk_tools build fix