Merge "Clean up etc1tool."
am: 12b751f1f8

* commit '12b751f1f8efdadf50731dd1ef6af6ac99d061cc':
  Clean up etc1tool.