Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev