make string replacement more robust
re-enable x86 stager
Merge pull request #11 from timwr/android-bins

better string replacement