Merge "Removed duplicate definition of E2FSCK" am: d7a4e56a87
am: 7b578cbf10

* commit '7b578cbf10aab7460a0cc4e5735870a714ddac1b':
  Removed duplicate definition of E2FSCK