am fdb1410e: am ad402d2b: resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp

* commit 'fdb1410e6c895bbc1a299c249e79a5d38c9fbf7c':
  SDK: fix win-sdk build errors, make future errors fatal.