Merge "Add the tool etc1tool to the sdk." into eclair