Fix Android installation isues