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

Change-Id: Iae8a0cd530b63f2865c7a9bc50959dbd695c29f2