ios plist and android makefile fixes