Updated to latest android tools

Never a good thing. Took a day to get it working again