Revised osgAndroid that meets osgGap.