Changes to support building on android.