am 5296ee8e: am f936f66c: am ebb46d76: Merge "fs_mgr: Don\'t run e2fsck inside SDK system images."

* commit '5296ee8e0b4b73727126a6ac6319750d7b187545':
  fs_mgr: Don't run e2fsck inside SDK system images.