Merge pull request #180 from enh-google/master

Fix the i686-linux-android build.