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

* commit '15717a32c497895b294396c0000bc571790d3691':
  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