partial fix android build, still have errors