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

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