Merge "Pass block_list param to mksquashfs" into nyc-dev