Merge "Revert :Force sync files written by minzip" into android-6.0