Merge "PRODUCT_PACKAGES: add to tune2fs." am: 4337794acd am: a35fba1954
am: 7f5ac24eec

Change-Id: Ia038eb10af41c7403a04e9e5411700cd86079640