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

Change-Id: I6a81d1dfd2345adac498025d7ee335c9b4b044c6