Merge "e2fsck: update quota when optimizing the extent tree" am: 2ed20fdc91 am: 93853df15e
am: ebe17556a6

Change-Id: Idbaf9027d343b55c5d39c9e76def82b6b51c2a4f