Fixing up android build.