Fix for android build issue.#217

blitz-research wants to merge 2 commits intog-truc:0.9.5g-truc/glm:0.9.5from

blitz-research:0.9.5blitz-research/glm:0.9.5Copy head branch name to clipboard