am 9d218b29: Merge "android: support generating ext4 partition images"

* commit '9d218b29b65415eb0806584e3b43fe28bbbe5897':
  android: support generating ext4 partition images