- Updated to new Android tools