more android make fixes