- fixed some compile issues related to android