Merge pull request #14 from enh-google/master

Fix rmi4utils Android build.