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

* commit '8fe9274ab99a0a5e8894a8984d47a9c5a9c0c17c':
  Makefile: Pack squashfs and f2fs tools into otatools.zip.

Change-Id: I1e6830d90b471c70d6de450e0f0c04943dc38fec