Lots of changes and fixes; Returning to android toolsets