Merge "Revert "Add basic image writer support for app images"" am: c09b334456 am: 38db676ebe
am: 217b0b5f2b

* commit '217b0b5f2bff0c816821d69567ec93fe9bd38573':
  Revert "Add basic image writer support for app images"