Merge "Clean up etc1tool." am: 12b751f1f8
am: 845662e75f

* commit '845662e75fa61f633c43777e3cb5cd8e23b0260e':
  Clean up etc1tool.