Update Android build scripts to take an arch
Merge branch 'st' of github.com:suitabletech/qt5 into st