am 9edfe975: am 2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair

Merge commit '9edfe9759827ec86584b72b038c7ff5f9cf054c0'

* commit '9edfe9759827ec86584b72b038c7ff5f9cf054c0':
  Add etc1tool to Windows SDK.