am 514c487d: (-s ours) Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.

* commit '514c487dcb0f0a3ef800305bbf75c0773f1e4966':
  Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.