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

* commit '8191f1231dfe45923e8a060635bf7ccbe025a665':
  Makefile: Pack squashfs and f2fs tools into otatools.zip.

Change-Id: Ia035b329e08ac6baeb1a48de0bc59ae23771b7c8