am 2225c1f7: Merge "Revert "android: support generating ext4 partition images""

* commit '2225c1f739e3755bc955e055a00efe682b4b2aff':
  Revert "android: support generating ext4 partition images"