Some android build fixes