Fix cross compilation on android armv7 and x86#186

tgross35 merged 2 commits intorust-lang:masterrust-lang/cmake-rs:masterfrom

fredszaq:masterfredszaq/cmake-rs:masterCopy head branch name to clipboard