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

Change-Id: Id89be8d1c14a7d93c1946d7c3ec096fc9b20e231