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

* commit '93e16dca64443aab69d3007e29f69e93850c7427':
  libcutils: fs_config: winsdk_tools build fix