Merge "Fix build-stlport.sh to use platforms/android-X/arch-<arch> as --sysroot"