Merge "PRODUCT_PACKAGES: add to tune2fs."
am: 4337794acd

Change-Id: I156f1cb5ccd377785f77399e005bcfab10b5c3b3