android build fixes