Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." am: 8191f12
am: 9dba034

* commit '9dba034d254fabeaff19af1f6e53468e84456fe5':
  Makefile: Pack squashfs and f2fs tools into otatools.zip.

Change-Id: Iff411eb6ff631f2c7428e5976ac982298434b81a