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

* commit '38db676ebe56938fc6994831576815d4bb7f2ef6':
  Revert "Add basic image writer support for app images"