am df69250b: (-s ours) am 8e8ff4ca: Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread

Merge commit 'df69250b75c38e726ea7392c39349d9ef654fac6'

* commit 'df69250b75c38e726ea7392c39349d9ef654fac6':
  support for ext4/EMMC in target_files and OTA generation