Merge \\\"squashfs: make disable-4k-align a parameter\\\" into nyc-dev am: 8ebbc4e7e2 am: 3336f9ae67
am: 8256959769

Change-Id: I1b92046dea49474907d5b9e94726197608654f1a