From: Pyry Haulos <phaulos@google.com>
Date: Tue, 5 Jan 2016 16:40:46 +0000 (-0500)
Subject: Merge branch '141-fix-android-build-win-64' into 'master'
X-Git-Tag: upstream/0.1.0~812^2~413
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e4d82fb4f6e86583d7687d7511749e28e93602b;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge branch '141-fix-android-build-win-64' into 'master'

Fix Android build script on Windows 64 bit (NDK r10e)

- Correct Host OS name on Windows 64 bit in common.py
- Add the missing Host OS in toolchain file for NDK r10e
- Downgrade to LLVM 3.5 in NDK r10e because the prebuilt version 3.6 is
  missing the llvm-ar utility which is needed by the build script.


See merge request !236
---

7e4d82fb4f6e86583d7687d7511749e28e93602b