Add Android and Needle