am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev
am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev

* commit '0985ac04310f18be7dd814b9a07c93f144ad21c2':
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base