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

* commit 'b522d45b96a84de1e5e5ff1fe7740c3732935ed6':
  libcutils: fs_config: winsdk_tools build fix