Merge "squashfs: make disable-4k-align a parameter" into nyc-dev